.
Merge branch 'reminder' of https://github.com/wesleyk/17603 into reminder

Conflicts:
	index.html
	js/models/event.js