I have added the User class, you may look and say what you think
class User was changed
Merge branch 'master' of https://github.com/ithillel/Xipiv.git

Conflicts:
	Xipiv/src/org/hillel/it/xipiv/model/entity/Image.java
Merge branch 'master' of https://github.com/ithillel/Xipiv.git
changed class User