Bug Fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	EventPlanner/app/templates/createEvent.html