fixed css and js paths
Merge branch 'staging'