Added grid and selections.
Merge branch 'refs/heads/develop' into grid-and-selections
Merge branch 'refs/heads/master' into grid-and-selections
Fixed bug with toolbar theming.
Fixed import issue with macros.
Updated README.
zoomPhotosToFill option doesn't zoom standard images on a 4in display as it requires zooming in too far.
Double tapping a second time on an image now zooms it out.