Update guidelines.rst
Merge branch 'master' of github.com:aldryn/aldryn-boilerplate into develop