Mini fix asset location in css
Merge branch 'master' into staging