cleaned up entitiy code
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2014-team3

Conflicts:
	room4you/config.properties
	room4you/src/main/java/ch/room4you/entity/User.java