Merge branch 'develop'
Create new branch and uploaded new changes
Update style
Merge remote-tracking branch 'origin/develop' into feature/new-ui

Conflicts:
	config/config.ini
	system/views/merchandising.phtml
	system/views/product.phtml
	system/views/product/grouping-price.phtml
	system/views/uitab.phtml
	web/js/modules/product/views/app.js
Change style
Change style
Update html & css
Merge branch 'develop' into feature/new-ui
Update html & css and started  Shopping
Update html & css
Finish  Manage zones
Finish Tax configuration
added check for select name = "zoneId
finished work on "Organize Page", has returned to its previous form
already done: main screens (pages, media, SEO, layout, othe), WID card, webbuilder, News
UI updates
UI updates
Toaster UI updates
Toaster UI updates
Added expand for "edit template / css"