add routes to js
change events api
Merge branch 'feature/event_calendar_42' into staging

Conflicts:
	app/assets/javascripts/application.js