Video template & Image fixes
Sortorder vet ge-ajaxed (Page)
Avondwerk
Merge branch 'master' of https://github.com/jeuris/steiner_dev
Merge branch 'master' of https://github.com/jeuris/steiner_dev

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

Conflicts:
	fuel/app/classes/controller/private/page.php
	fuel/app/views/templates/video.php
Template data overhaul
Merge branch 'master' of https://github.com/jeuris/steiner_dev

Conflicts:
	public/assets/js/beheer.js
	public/assets/js/beheer.js.orig
	public/files/full/test.jpg
	public/files/thumb/test.jpg
SQL changes