Merge branch 'develop_IOS' into develop
Merge branch 'develop_IOS' of https://github.com/BitMobile/solutions into develop
Merge branch 'develop' into develop_android
Change Tasks with multiline TextView
Change Tasks and Stocks with multiline TextView
Change grid height from % to sp
Increase size in duallineBlok
Naming refactoring
Complete refactoring
Rename some styles
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
Merge branch 'develop' into develop_IOS