add css and js files
assets stuff
add jquery
Merge branch 'dev'