develop7
Merge branch 'release' of https://github.com/matchingood/test into develop

Conflicts:
	test.txt