Changed application.js.coffee to application.js (reversion of my previous commit)
Merge remote-tracking branch 'origin/master'