fix setup instructions
Merge branch 'master' into feature-webfont-0.4
integrate web-fonts into build