committing for merge.
Merge branch 'develop' of https://github.com/simkimsia/label-ecommerce into develop

Conflicts:
	src/labelecommapp/View/Themed/V1/Layouts/default.ctp
Commit for merge