Classroom pagina met x-editable
Merge branch 'dev'
Classrooms pagina test
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone
Merge branch 'dev'
Classrooms pagina met x-editable
Merge branch 'dev'
Merge pull request #152 from svdvonde/master

Classrooms pagina voor tim
Merge branch 'master' of https://github.com/CalZoneVUB/CalZone

Conflicts:
	JavaServer/calzone/.settings/org.eclipse.jdt.core.prefs