slug pushed
Merge branch 'master' of https://github.com/jeuris/steiner_dev

Conflicts:
	public/assets/js/beheer.js