NEW UI changes
Merge branch 'master' of github.com:Redmart/delivery_module2