WIP edit date/time
Merge branch 'master' of https://github.com/kaitlinhuben/fourpeople

Conflicts:
	js/itinerary.js