Pages fixes 2.0
Registratie zonder fikse error

Hops
Merge branch 'master' into Rick-test

Conflicts:
	bross/fileupload/templates/fileupload/picture_form.html
	bross/fileupload/urls.py
	bross/pages/models.py
	bross/pages/views.py
	bross/urls.py
	core/templates/add_page.html
	core/templates/base.html
	core/templates/edit_page.html
	core/templates/fileupload/picture_confirm_delete.html
	core/templates/fileupload/picture_form.html
	core/templates/page_editor.html
	core/templates/sjaan_thema/base.html
	core/templates/sjaan_thema/fullwidth.html
	core/templates/sjaan_thema/landing.html