Merge "Use an actionbar - move the "show original" button to the bottom left -...

Merge "Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu." into gb-ub-photos-arches