Change profile page
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimDevelopment
Globals klasse toegevoegd
Merge branch 'profilepage'
Merge pull request #35 from svdvonde/master

Globals var toegevoegd
Klasse CourseData toegevoegd
Merge pull request #36 from svdvonde/master

Klasse CourseData toegevoegd
If-tests toegevoegd rond de debug prints
Merge branch 'FerDev'
Merge pull request #37 from fsuarezg/master

Debug prints in een if-test gezet
Login form hashing to SHA256
Activation to ROLE_STUDENT
DB file now made in beans + using beans example
Profile Controller no activation
Password Validator
Password Insert working with beans
Security Length Key Update
Merge branch 'CalZoneMaster' into MyMaster

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/db/DbConfigFile.java
	JavaServer/calzone/src/main/java/com/vub/model/User.java
Merge branch 'MyMaster' into courses