Fix bower-rails
Merge branch 'develop'

* develop:
  Fix bower-rails