alert messages
Merge branch 'master' of https://github.com/aumd/TravelCompanion

Conflicts:
	assets/www/reservationForm.html