validation weggehaald
Merge remote-tracking branch 'origin/Base' into Luuk2
aids
nog meer aids
head
Merge remote-tracking branch 'origin/Base' into Luuk2

Conflicts:
	php/views/admin/add-marker.php
head
Merge remote-tracking branch 'origin/Base' into Luuk2
font-awesome
facebook login button
registratie student + database class // half af
Merge remote-tracking branch 'origin/Luuk2' into Base
Merge branch 'Kai' of https://github.com/ninox92/StudyMap into Kai