minor refactoring: rails_best_practices
Merge branch 'dev'