Refactoring
Merge branch 'master' of github.com:plone/ansible-playbook

Conflicts:
	docs/preparing.rst