Merged.
Merge branch 'master' of https://github.com/tgbadorrek/PhotoGenome.git

Conflicts:
	PhotoGenome/src/main/resources/hibernate.cfg.xml