Coffee -> JS
Merge branch 'develop'