inloggen
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/app/partials/inloggen.html
inloggen
Merge remote-tracking branch 'origin/master'