post werkt
Merge branch 'master' of https://github.com/hkruisselbrink/WebTech

Conflicts:
	build/classes/model/User.class
	src/model/User.java
	src/resources/MovieJersey.java
	src/resources/MoviesJersey.java
	src/resources/UserJersey.java
	src/resources/UsersJersey.java