use rails plugin instead of rails
Merge branch 'master' into datacare

* master:
  use rails plugin instead of rails