organize routing
Merge branch 'master' into class-diag

Conflicts:
	app.coffee
	routes/index.coffee