some bug fixed
Discount at Order_EditSKU fixed, some cosmetic add
Merge branch 'develop_android' into develop
Merge branch 'develop_IOS' into develop

Conflicts:
	Demo2/d/resource/app/Screen/Encashment.xml
	Demo2/d/resource/app/Screen/Order_EditSKU.xml
	Demo2/d/resource/app/Screen/Receivables.xml
	Demo2/d/resource/app/Screen/Stock_SKUs.xml
	Demo2/d/resource/app/Screen/Task.xml
	Demo2/d/resource/app/Screen/Visit_Order_Commentary.xml
	Demo2/d/resource/app/Screen/Visit_Task.xml
Merge branch 'develop_IOS' into develop

Conflicts:
	Demo2/d/resource/app/Screen/Encashment.xml
	Demo2/d/resource/app/Screen/Order_EditSKU.xml
	Demo2/d/resource/app/Screen/Receivables.xml
	Demo2/d/resource/app/Screen/Stock_SKUs.xml
	Demo2/d/resource/app/Screen/Task.xml
	Demo2/d/resource/app/Screen/Visit_Order_Commentary.xml
	Demo2/d/resource/app/Screen/Visit_Task.xml
Remove trash files and change location of project
Remove a piece of trash
Merge branch 'develop' into develop_android