Editor opgegeild
Merge branch 'master' of https://github.com/jeuris/steiner_dev

Conflicts:
	public/assets/css/style.beheer.css