controller private page_configurator
Merge branch 'master' of https://github.com/jeuris/steiner_dev

Conflicts:
	fuel/app/classes/controller/private.php
config edit
Merge branch 'master' of https://github.com/jeuris/steiner_dev

Conflicts:
	fuel/app/classes/controller/private.php