Merge branch 'master' of https://github.com/thlias/angular-rails-template
Merge branch 'master' of https://github.com/thlias/angular-rails-template