Remove jquery from application.js, it is already loaded in application.html
Fix merge of application.css.scss
Fix merge of application.html