pull right jaja
Merge branch 'master' of https://github.com/jeuris/steiner_dev
header niks
Merge branch 'master' of https://github.com/jeuris/steiner_dev
avondje
Merge branch 'master' of https://github.com/jeuris/steiner_dev

Conflicts:
	fuel/app/views/templates/header.php
	public/assets/js/beheer.js