mobiele client v0.2
Merge branch 'master' of https://github.com/hkruisselbrink/WebTech

Conflicts:
	src/resources/MovieJersey.java
Merge branch 'master' of https://github.com/hkruisselbrink/WebTech
yehyeheyhe