Merge branch 'develop' of github.com:loadedcommerce/loaded7 into develop
Merge branch 'develop' of github.com:loadedcommerce/loaded7 into develop
added session config
added session config
Merge remote-tracking branch 'remotes/origin/B2963' into develop

Conflicts:
	catalog/includes/version.txt
	catalog/includes/work/updates/runAfter/controller.php