Merge branch 'develop' of github.com:loadedcommerce/loaded7 into develop
[IC] general cleanup
[IC] general cleanup
Merge remote-tracking branch 'remotes/origin/develop' into D532

Conflicts:
	catalog/admin/templates/default.php