Aanpassingen vorige commit en Verena's code
Merge branch 'master' of https://github.com/VerenaVertonghen/know-brainer

Conflicts:
	code/app/views/layouts/default.blade.php