Update jQuery version
Move scss and scripts to assets/stylesheets and assets/javascripts
Mergefix