Merge remote-tracking branch 'remotes/origin/develop'
Merge remote-tracking branch 'remotes/origin/develop'
Update README.md
Removed autofocus from Group Name input field

auto focus was causing issue with disableKeyCombo, was removed
Merge pull request #88 from loadedcommerce/B977

B977
Merge remote-tracking branch 'remotes/origin/release-7.0.0.4.0'
#1048 repaired 500 error with updater
#1048 repaired 500 error with updater
#1048 added logic to chmod 644 php files after update
Merge remote-tracking branch 'remotes/origin/develop'

Conflicts:
	README.md
	catalog/admin/includes/applications/updates/classes/updates.php
[IC] updated version
Merge pull request #137 from loadedcommerce/D972

D972
Merge remote-tracking branch 'remotes/origin/develop'
[IC] updated version
Merge remote-tracking branch 'remotes/origin/develop'

Conflicts:
	catalog/includes/version.txt
Merge remote-tracking branch 'remotes/origin/develop'
[IC] added gpl 2 license
Merge remote-tracking branch 'remotes/origin/release-7.0.2.0'
[IC] commit zones addon fix
[IC] commit zones addon fix