fixed styleguide file for github
Merge branch 'master' into core