add final commit feature/2
Merge remote-tracking branch 'origin/feature2' into develop

Conflicts:
	git_sample/src/readme.txt
	git_sample/src/readme2.txt