dans test
erge branch 'feature/dans_feature_test' into develop

m into a topic branch.
dans test
Merge branch 'develop' of https://github.com/stdev/st-gitflow-training into develop

Conflicts:
	index.php
erge branch 'develop' of https://github.com/stdev/st-gitflow-training into develop

test merge