Show action with angularjs
Merge branch 'master' of github.com:thukim/angular

* 'master' of github.com:thukim/angular:
  Need not use routing for angular (provided by rails)

Conflicts:
	app/views/layouts/application.haml

Conflicts:
	app/views/layouts/application.haml