add some info feature1/id
add some info 2 feature1/id
add some info 3 feature1/id
add local info feature2/id
add info feature2/id
Merge remote-tracking branch 'origin/feature2' into development

Conflicts:
	git_sample/src/readme.txt
Merge remote-tracking branch 'origin/development'