double $json = array(); in attribute file on autocomplete function
Added user group permission for error log
Merge pull request #1080 from eka7a/master

Added user group permission for error log
admin work done
Merge branch 'master' of https://github.com/opencart/opencart

Conflicts:
	upload/admin/controller/sale/order.php
	upload/admin/controller/sale/voucher.php
Merge branch 'master' of https://github.com/opencart/opencart into sim

Conflicts:
	upload/catalog/controller/payment/authorizenet_sim.php
	upload/catalog/view/theme/default/template/payment/authorizenet_sim.tpl
	upload/catalog/view/theme/default/template/payment/authorizenet_sim_callback.tpl