no message
Merge branch 'maakVorming' into nieuweMaster

Conflicts:
	backend/.idea/workspace.xml
	backend/SQL/db joetz.sql
	frontend/app/scripts/controllers/overzichtVormingen.js
	frontend/app/scripts/services/auth.js
Merge branch 'nieuweMaster'

Conflicts:
	frontend/app/scripts/controllers/overzichtVormingen.js
	frontend/app/scripts/services/auth.js