Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev
Insert+Delete Enrollment
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev
CSS Error bij password forgot pagina
Merge pull request #71 from nicocarraggi/nicodev

Enrollment
EnrollmentDao
Wijzigingen interfaces DAO
Merge pull request #73 from nicocarraggi/nicodev

get course with courseID & get enrolled courses ( BODY NOT FINISHED )
get course with courseID & get enrolled courses ( BODY NOT FINISHED )
Merge pull request #74 from nicocarraggi/nicodev

no message
no message
FR 1.4 & 2.1
find course by courseID & select all enrolled courses from user
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into nicodev

Conflicts:
	JavaServer/calzone/src/main/java/com/vub/dao/EnrollmentDao.java
Merge pull request #75 from nicocarraggi/nicodev

find course by courseID & select all enrolled courses from user
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone into Dev2
FR 2.1 Bugfixes
Fix voor Displayname rooms
Merge pull request #77 from nicocarraggi/nicodev

EnrolledCourses