photosync changes2
Merge branch 'master' of https://github.com/mefleky/AuditWebService

Conflicts:
	audit/src/main/java/com/unilever/audit/entities/Photo.java
Merge origin/master

Conflicts:
	audit/src/main/java/com/unilever/audit/entities/Photo.java