Merge branch 'style_2'

Conflicts:
	src/coffee/router.coffee