Move js to app/assets/javascripts
Merge branch 'michael'