weekend edit
Merge branch 'master' of https://github.com/NovaTango/Tango

Conflicts:
	docent-vakken.php
	profiel.php
	scoreboard.php
	settings.php
	vakken.php