Merge pull request #86 from svdvonde/master

PULL
Css aampassing /rooms
FR 1.4: Ingeschreven vakken aanpassen (Voltooid)
Merge commit '21c53919a505a86c1ae63a5cbf478bca1e20f8e8'
Merge pull request #88 from MPieter/master

FR 1.4: Ingeschreven vakken aanpassen (Voltooid)
FR 1.4: Security Fix
Merge commit '3f1e812e167299c1cc1a9131892b3e75cbdbed34'
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimDevelopment
Dependencies for Metrics plugin
Merge commit 'ebb392b999761232ecbe797a77621257660c5c0a' into Dev2
Merge branch 'Dev2'
Merge pull request #89 from MPieter/master

FR 1.4: Security Fix
Deployment script
Hibernate POC. Heeft de juiste bestandsstructuur maar werkt nog niet 100%
Merge branch 'Hibernate'