added apps plugin on client dashboard mass action
changed apps lexem
changes for freeshipping with zones
added analyzing discount in cart calculation
Merge branch 'feature/apps' into develop
added tax for order view
Merge branch 'feature/freeshipping' into develop
Merge branch 'develop' into feature/new-ui

Conflicts:
	system/views/shipping.phtml
UI updates