'git rm --cached' a lot of files
Merge branch 'master' of https://github.com/ulyfish/opencart

Conflicts:
	admin/config.php