deleting old code
Merge branch 'develop'

Conflicts:
	javascripts/src/routers/main_router.coffee