Fix bug with webpack styles
Merge remote-tracking branch 'origin/master' into chrome-1