Change activities to offers
Merge branch 'master' of https://github.com/2She2/RideWithUs.git

Conflicts:
	RideWithUs/scripts/app/view-models/login.js
	RideWithUs/views/activitiesView.html
	RideWithUs/views/activityView.html