user specific rides - in progress
Merge branch 'master' of https://github.com/himalie/rideshare_mobile

Conflicts:
	www/js/services/reservation-service.js
	www/js/services/ride-service.js
Merge branch 'master' of https://github.com/himalie/rideshare_mobile

Conflicts:
	www/js/services/reservation-service.js
	www/js/services/ride-service.js