Limits add
Merge branch 'develop_IOS' into develop_android

Conflicts:
	Demo2/d/resource/app/Screen/Order.xml
	Demo2/d/resource/app/Screen/Visit_Order.xml