Move assets into public/assets, bootstrap now in public
Merge branch 'master' into website