Om te zorgen dat ik kan mergen
\
Merge branch 'master' of https://github.com/koenalphen/Studiereis

Conflicts:
	Studiereis/settings.py
Merge branch 'master' of https://github.com/koenalphen/Studiereis
Large commit of server modified files.