dev1 add new function to feature1
Please enter the commit message for your changes. Lines starting
Dev2 add new function to feature2
This commit made by dev12
This commit made by dev1
Merge branch 'dev1' of https://github.com/ThangnvOlbius/force into dev1

Conflicts:
	feature1.xml
Merge remote-tracking branch 'origin/dev1' into dev
Merge remote-tracking branch 'origin/dev2' into dev