Merge branch 'master' into Robbert
reservaties
Merge branch 'master' into Robbert

Conflicts:
	classes/DB.class.php
	classes/Menu.class.php
feedback
feedback
Merge branch 'Robbert'

Conflicts:
	classes/Restaurant.class.php