[IC] added global iris
Merge branch 'develop' of github.com:loadedcommerce/loaded7 into develop
Merge remote-tracking branch 'remotes/origin/D1305' into develop
#1305 working on global iris
#1305 working on global iris
#1305 working on global iris
#1305 working on global iris
#1305 working on global iris
Merge remote-tracking branch 'remotes/origin/D1305' into release-7.0.2.0

Conflicts:
	catalog/includes/languages/en_US.xml