no message
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone

Conflicts:
	JavaServer/calzone/target/classes/com/vub/controller/LoginController.class
wilma db 2
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone
Cookies
Update user attributes validation
Merge pull request #1 from CalZoneVUB/master

Inverse pull request
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimDevelopment

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/controller/LoginController.java
	JavaServer/calzone/target/classes/com/vub/controller/LoginController.class
SessionDao
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone
Merge branch 'nicodev'
Merge pull request #10 from nicocarraggi/master

SessionDao
BugFix
Automatic redirection of /profile
controller
Runtime fix for relative path warnings.
No changes made here.
Basic template build on top of bootstrap.
Web.xml update to allow inclusion of css, is and png files.
Basic login page layout.