moved js to application.js
merge