final commit feature2/id
Merge remote-tracking branch 'origin/feature2' into development

Conflicts:
	git_sample/src/readme.txt