Commit to get the pull.
Merge branch 'master' of https://github.com/adammeaney/Qt

Conflicts:
	PhotoAlbum/PhotoAlbum.pro