testando branch develop
my feature branch
xMerge branch 'my-feature' into develop

Conflicts:
	develop
	master
	master-feature
Merge branch 'release-0.1'