Merge pull request #5 from CalZoneVUB/master

Reverse pull request
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
CourseInformation pagina toegevoegd
Merge pull request #115 from fsuarezg/master

CourseInformation pagina toegevoegd
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd