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

Conflicts:
	classes/DB.class.php
	classes/Menu.class.php
menu dynamisch linken
Merge remote-tracking branch 'origin/master' into andry
login update with maser
login, backend delelte
update met master
conflicts removed
clean up van files
clean up part 2
clean up part 3
menu dynamisch linken
clean up van files
clean up part 2
clean up part 3
tafels aangepast
nieuwe db
Merge remote-tracking branch 'origin/andry'
bijegewerk