fix pointers to css and js assets
Merge remote-tracking branch 'origin/master'