Merge branch 'develop'
Added coffeescript to Gemfile
Merge branch 'develop'
Added coffee-script to Gemfile
Merge branch 'master' into develop