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

Conflicts:
	PhotoGenome/pom.xml
	PhotoGenome/src/main/java/edu/cmu/photogenome/actions/embedinformation/EmbedInformationController.java
Merge branch 'master' of https://github.com/tgbadorrek/PhotoGenome.git

Signed-off-by: hemant99911 <hemant99911@gmail.com>