Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Emergency fix

See
https://devcenter.heroku.com/articles/rails-asset-pipeline#troubleshooti
ng
Merge branch 'develop'
Merge branch 'develop'
BIG EMERGENCY FIX (notes to text type)
Merge pull request #22 from keanulee/master

Master changes into develop