changed model
Merge branch 'master' of https://github.com/Asmayra/SoPra.git

Conflicts:
	SoPra/src/main/java/org/model/User.java
changed to local
Merge branch 'master' of https://github.com/Asmayra/SoPra.git