Delete collection 80%
Merge branch 'master' of https://github.com/jeuris/steiner_dev

Conflicts:
	fuel/app/views/templates/collection-holder.php