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

Conflicts:
	fuel/app/config/app.php
	fuel/app/views/templates/text-columns.php