Changes made by Yoanna Mareva (jo.thirdeyevision@gmail.com).
Merge branch 'master' of https://github.com/Wooanna/TripTrackerApplication.git

Conflicts:
	Trip Tracker/scripts/view-models/invitePeople-model.js
	Trip Tracker/views/peopleToWatch.html