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
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
Platformafhankelijke file
Platform onafhankelijk files.
Merge branch 'master' of http://github.com/CalZoneVUB/CalZone
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.
Basic „create” page layout.
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone

# By Timbo925 (5) and nicocarraggi (3)
# Via nicocarraggi (4) and Timbo925 (3)
* 'master' of https://github.com/CalZoneVUB/CalZone:
  controller
  Automatic redirection of /profile
  BugFix
  SessionDao
  Update user attributes validation
  Cookies
  wilma db 2
  no message