Beke rolecontrole voor blog en wat diverse dingen
Merge branch 'master' of https://github.com/Onomanatee/project_JOETZ

Conflicts:
	b/public/modules/vakanties/controllers/vakanties.client.controller.js