This commit made by dev1
Merge branch 'dev1' of https://github.com/ThangnvOlbius/force into dev1

Conflicts:
	feature1.xml
Merge branch 'dev1' of https://github.com/ThangnvOlbius/force into dev1

Conflicts:
	feature1.xml