categories status work
lang updates
more updates
more updates
more updates
Merge remote-tracking branch 'remotes/origin/develop' into D972

Conflicts:
	catalog/admin/templates/default/css/styles/custom.css
run after controller updates
Merge branch 'D972' of github.com:loadedcommerce/loaded7 into D972

Conflicts:
	catalog/includes/work/updates/runAfter/controller.php
Merge branch 'D972' of github.com:loadedcommerce/loaded7 into D972
[IC] update install sql
[IC] updated sample data for category pages
Merge branch 'D972' of github.com:loadedcommerce/loaded7 into D972
[IC] updated sample data sql for category pages
Merge remote-tracking branch 'remotes/origin/D972' into hc-branch

Conflicts:
	catalog/admin/templates/default/css/styles/custom.css