Updates on styleguide for add-ons
Merge branch 'master' of github.com:plone/documentation