add info. feature2
Merge remote-tracking branch 'origin/feature2' into dev

Conflicts:
	git_sample/src/readme.txt