starting new event form
New event form created
Merge branch 'event-page' into gh-pages

Conflicts:
	app/viewmodels/shell.js
fixed merge conflict