Merge branch 'registreer_webapp' of https://github.com/MaicoDhaenens/joetz

Conflicts:
	frontend/app/scripts/services/auth.js
Merge branch 'master' of https://github.com/MaicoDhaenens/joetz