Merge
Merge branch 'master' of https://github.com/darzul/photo_viewer

Conflicts:
	PhotoViewer/PhotoViewer.v11.suo