Merge branch 'develop_IOS' of https://github.com/BitMobile/solutions into develop_IOS

Conflicts:
	SuperAgent/solution/resource/app/Screen/Order_EditSKU.xml