scraper + resultaat toegevoegd
Spring security Initieel
start courses
Spring Security: Database ondersteuning
Additions/deletions for courses.
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
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
Usertypes
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev
Merge pull request #34 from nicocarraggi/nicodev

New UserTypes
Merge branch 'CalZoneMaster' into MyMaster

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/controller/HelloController.java
	JavaServer/calzone/target/m2e-wtp/web-resources/META-INF/maven/com.vub/calzone/pom.xml
Merge branch 'MyMaster' into courses
Change profile page
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimDevelopment