Merge pull request #30 from nicocarraggi/nicodev

ActivationKey Changes
Readmy SQL
Spring security Initieel
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone
Spring Security: Database ondersteuning
Merge pull request #1 from CalZoneVUB/master

Reversed pull request
Thema bronnen aangevuld met extra css & javascript voor de kalender
Requestmapping naar /hello
File type mapping update
Json fix (events.json & app.js) en front-end pagina van de kalender
Merge pull request #31 from gaethofs/master

Front-end pagina voor de kalender
Standaardtaal gewijzigd naar Nederlands (+ extra vertaling Engels) - gedeeltelijk vertaald!
Tabbladen toegevoegd aan profiel
Merge pull request #32 from gaethofs/master

Profiel/Kalender update
Merge pull request #33 from nicocarraggi/nicodev

Enabled Users ipv Not Registered Users
Spring Security: Session Management
Merge branch 'SpringSecurity' of https://github.com/CalZoneVUB/CalZone into TimDevelopment

Conflicts:
	JavaServer/calzone/src/main/webapp/WEB-INF/jsp/profile.jsp
	JavaServer/calzone/target/classes/com/vub/controller/LoginController.class
Activation
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev