initial home flow (after login, home -> mytrips)
backend integration
cl
add ang frontend remove trip
Merge branch 'master' into feature/home_flow
update delete method
update delete method
update delete method
update delete method
update delete method
update delete method
update delete method
working update and delete trip methods
Merge branch 'feature/home_flow' into develop
Merge branch 'master' into develop

Conflicts:
	ionic/www/user/user.service.js
	server/api/user/user.controller.js