Stuff and things
Merge branch 'master' of https://github.com/CompraBV/Olympia-Campings

Conflicts:
	controllers/user.php
	views/templates/user/header.php