修改application.js
merge