no message
no message
Merge branch 'master' of https://github.com/MaicoDhaenens/joetz

Conflicts:
	frontend/app/scripts/controllers/Profiel.js
	frontend/app/scripts/controllers/profiel.js
	frontend/app/scripts/services/trips.js