b-1
Merge branch 'develop' into feature/b

Conflicts:
	test.txt
b-4
Merge branch 'feature/b' into develop