merging- also fixed rotate
Merge remote-tracking branch 'origin/master'

Conflicts:
	PhotoAlbum/mainwindow.cpp