Katia's amazing JS changes
Merge branch 'master' into js_is_awesome
Merge pull request #8 from mule-deer-2014/js_is_awesome

Js is awesome