Profile bijwerken
Merge branch 'master' of https://github.com/Geoffry304/MobileOne

Conflicts:
	webapps/app/scripts/controllers/vakantie.js
	webapps/app/views/profile.html