My Shit
Merge branch 'master' of https://github.com/rwfeather/qtphoto

Conflicts:
	photo/photo/imageviewer.cpp