FR 1.6: Ondersteuning voor afmelden
Merge commit '8e79bd0d6fb61c679f4cab68c33b429769b6884b' into Dev
Weergave profiel
Read CSV Rooms
Internationalization support
Merge pull request #40 from yocoppen/master

Course additions
FR 1.7: Profiel aanpassen (Back end)
Merge branch 'Dev'

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/controller/ProfilePageControler.java
	JavaServer/calzone/src/main/java/com/vub/model/User.java
	JavaServer/calzone/target/classes/messages.properties
	JavaServer/calzone/target/classes/messages_nl.properties
Bugfixes door merge.
Hello Controller
Merge branch 'master' into TimDevelopment

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/controller/HelloController.java
	JavaServer/calzone/src/main/java/com/vub/controller/PasswordForgetController.java
	JavaServer/calzone/src/main/java/com/vub/model/Room.java
Student
Test Controllers
Update update