Adapted Setup
Merge branch 'master' of https://github.com/Chive/cookiecutter-aldryn-addon

Conflicts:
	cookiecutter.json