douwe is een neger
merge conflicts!!!

Merge branch 'master' of https://github.com/legopiraat/MD-RIA-Agenda

Conflicts:
	server/client/app/models/EntryModel.js
	server/client/app/views/entry.phtml
	server/client/index.phtml