Updated static assets
Merge remote-tracking branch 'upstream/master' into super-admin