put js script in application.rb
Merge branch 'master' into authenticate