HTML5
Cleanup
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone
Database inside Calzone
Merge pull request #7 from nicocarraggi/master

Database inside Calzone
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone
FreshDb + upgradeNotRegisteredUser
Merge pull request #8 from nicocarraggi/master

FreshDb + upgradeNotRegisteredUser
Account Creation + Clean up Code
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/controller/LoginController.java
	JavaServer/calzone/src/main/java/com/vub/db/DbTranslate.java
	JavaServer/calzone/src/main/java/com/vub/model/UserDao.java
Bugfixes
Form Validation
Session Objects
Database wilma 2
Login Contoller
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone

Conflicts:
	JavaServer/calzone/src/main/resources/messages.properties
	JavaServer/calzone/src/main/resources/messages_nl.properties
	JavaServer/calzone/src/main/webapp/WEB-INF/jsp/password.jsp
	JavaServer/calzone/target/classes/messages.properties
	JavaServer/calzone/target/classes/messages_nl.properties