tools opzet
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/Content/styles.css
	client/Scripts/editor.js
	client/Scripts/main.js
	client/app/partials/Editor.html
	client/postkamer.html