Merge pull request #5 from CalZoneVUB/master

Reverse pull request
Email Test
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into Hibernate
Email Unit Test
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into Hibernate
Unit Test
talen
Merge branch 'FerDev'
Merge pull request #6 from CalZoneVUB/master

Reverse pull request
Pagination voor Vakken
Merge pull request #110 from gaethofs/master

jQuery Pagination
search courses toegevoegd
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone
Merge branch 'FerDev'

Conflicts:
	JavaServer/calzone/src/main/webapp/WEB-INF/jsp/EnrollCourses.jsp
Merge pull request #111 from fsuarezg/master

Search Courses Toegevoegd
[NIET WERKEND] Basismodel courses en de database operaties
[NIET WERKEND] Veel uitgecommentarieerde code
[NIET WERKEND] Merge met laatste versie

Merge branch 'Courses' into Courses-updated

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/dao/CourseDao.java
	JavaServer/calzone/src/main/java/com/vub/model/Institution.java
	JavaServer/calzone/src/main/java/com/vub/model/User.java
Merge pull request #113 from svdvonde/Courses

Courses
Merge branch 'Database' of https://github.com/CalZoneVUB/CalZone into nicodev

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/model/User.java
	JavaServer/calzone/target/classes/messages.properties
	JavaServer/calzone/target/classes/messages_nl.properties