coffee-rails gem outside of assets
Merge remote-tracking branch 'origin/master'