Behuizingen

Zie behuizingen
Merge remote-tracking branch 'origin/master'

Conflicts:
	app.js
	js/controllers/MainController.js
	templates/content/moederbordview.html