talen
Merge branch 'FerDev'
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
Api Tests
Profile Page Edit Fields
CourseInformation pagina toegevoegd
Merge pull request #115 from fsuarezg/master

CourseInformation pagina toegevoegd
Profile edit error messages
Profile Page edit button + page view security
Changing navigation bar depending on login status + User Type Account detection
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into TimFrondEnd
CourseInformation Security
Profile Page fix
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into CrstoDev

# By Timbo925 (7) and Fernando Suarez (3)
# Via Fernando Suarez (3) and others
* 'master' of https://github.com/CalZoneVUB/CalZone:
  Profile Page fix
  CourseInformation Security
  Changing navigation bar depending on login status + User Type Account detection
  Profile Page edit button + page view security
  Profile edit error messages
  CourseInformation pagina toegevoegd
  Profile Page Edit Fields
  Api Tests
  search courses toegevoegd
  talen