Merge remote-tracking branch 'origin/test-Sjaan' into Rick-test

Conflicts:
	bross/pages/models.py
Geen idee wat heir in zit
Merge remote-tracking branch 'origin/test-Sjaan' into Rick-test

Conflicts:
	bross/pages/models.py
IDFK
Merge branch 'master' into Rick-test

Conflicts:
	bross/pages/views.py
	core/static/sjaan_thema/css/jquery.fancybox.css
	core/static/sjaan_thema/css/style.css
	core/static/sjaan_thema/js/jquery-1.9.0.min.js
	core/static/sjaan_thema/js/jquery.fancybox-buttons.js
	core/static/sjaan_thema/js/jquery.fancybox.js
	core/templates/sjaan_thema/fullwidth.html
STYLING FORMS N SHITZ
CSS Button BIG
butto nfix
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
Merge branch 'master' of https://github.com/Genuscastor/bross