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
added text brand

correction in breadcrumb on product page when manufacturer_id exists
fixed

https://github.com/opencart/opencart/issues/1084
removed merge code
fix for

https://github.com/bassco/opencart/commit/8d0701c6d0f7dd8660d745bac9ce47c1cda3604b
Merge pull request #1083 from stan-bg/patch-11

added text brand
unfinished list grid category page
more work done on product list / girds
more product list / grid work done
product list / grid finished
added product grid / list to other pages
more admin work done
Selected default customer group when adding a new tax rate
Merge pull request #1095 from eka7a/master

Selected default customer group when adding a new tax rate
Merge branch 'master' into development-feature-profiles
Updated admin icons to bigger format and correct icon image.

Fixed controller name in payflow gateway on ajax call.

Fixed standard permission for new controller name in sql file.