ik verwacht merge conflicts
deze dikke merge error in agenda controller
Merge branch 'master' of https://github.com/legopiraat/MD-RIA-Agenda

Conflicts:
	server/client/app/controllers/AgendaController.js