starting single page
Merge branch 'master' of github.com:jccarte/ConferenceScheduler

Conflicts:
	app/assets/javascripts/routers/calendars_router.js.coffee
single page seems to be working