Update UI
Update UI
Merge branch 'develop' of https://github.com/RoyJin1987/Abs into develop

Conflicts:
	www/js/requestDelivery.js
	www/requestDelivery.html
Merge branch 'develop' of https://github.com/RoyJin1987/Abs into develop

Conflicts:
	www/js/editOrder.js
	www/js/requestDelivery.js