Fix for 512 tile size (tiff)
Fix conflict (mostly indentation)
Mobile device pan and rotate fix for flip.  + accerlation for desktop panning/
Merge branch 'flip'

* flip:
  Mobile device pan and rotate fix for flip.  + accerlation for desktop panning/
  Fix for 512 tile size (tiff)