Maj asset + JS
Merge branch 'master' of https://github.com/Ralys/Web