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

Conflicts:
	public/assets/js/beheer.js
maandag
Merge branch 'master' of https://github.com/jeuris/steiner_dev

Conflicts:
	fuel/app/classes/controller/private.php
	fuel/app/classes/controller/private/api.php
	fuel/app/config/app.php
	public/assets/js/beheer.js