add coffee-script as it is needed by heroku
Merge branch 'dev'