add some feature
Vasia user add new good feature
Merge branch 'feature1'

Conflicts:
	TestData_2.xml
resolved!