scraper + resultaat toegevoegd
start courses
Additions/deletions for courses.
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
FR 1.6: Ondersteuning voor afmelden
Merge commit '8e79bd0d6fb61c679f4cab68c33b429769b6884b' into Dev
Weergave profiel
no idea
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
Merge branch 'CalZoneMaster' into MyMaster

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/model/CourseComponent.java
Merge branch 'MyMaster' into courses
Internationalization support
Expanded and added course related classes/enums to match the current
database model + very small attention points towards scheduling and
third iteration.
Put all the unnecessary imports in commentary. This reduced the number
of warnings from 236 to 184!
Merge pull request #40 from yocoppen/master

Course additions
FR 1.7: Profiel aanpassen (Back end)
Merge branch 'Dev'

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/controller/ProfilePageControler.java
	JavaServer/calzone/src/main/java/com/vub/model/User.java
	JavaServer/calzone/target/classes/messages.properties
	JavaServer/calzone/target/classes/messages_nl.properties
Bugfixes door merge.