merging. I think I made resize behave better, and cleaned and commented code.
Merge remote-tracking branch 'origin/master' -

Conflicts:
	PhotoAlbum/mainwindow.cpp