added loading image when customer click on Confirm Order button, allow user have some feedback / response after click.
admin part, opencart documentation link was fixed
changed the directory image/data to image/catalog
Merge pull request #714 from hkulekci/patch-fix

admin part, opencart documentation link was fixed
more admin update done
Merge branch 'master' of https://github.com/opencart/opencart

Conflicts:
	upload/admin/view/template/common/header.tpl
updated header
added an ad tracking system so store owners can gage which ad placements generate sales.
header has been updated to match the new design
updated the path for loading the affiliate model
Update mysqli.php

mysqli_query changed to $this->mysqli->set_charset("utf-8");
deleted $i=0 and $i++ in while loop to $data[] = $row
Changed data/demo to catalog demo as per commit 6092447a22ac17dbb307339f0aa33a1b42ea36b0
<changed the directory image/data to image/catalog>
mysqli is_resource editing and adding some object to handle older actions
changing name of the mysqli class to handle zend server error.
Merge pull request #716 from robinflyhigh/master

Changed the directory image/data to image/catalog SQL Update
administrator user group permission error is fixed.

Changing is :

From
 `s:14:"marketing/affiliate";`
to
 `s:19:"marketing/affiliate";`

Fatal error: Uncaught exception 'ErrorException' with message 'unserialize(): Error at offset 2739 of 7722 bytes' in ….
statement variable was deleted. Maybe we can add it in the future for binding operations.
Merge pull request #722 from hkulekci/patch-1

Patch for mysqli driver
Merge pull request #718 from hkulekci/install-sql

administrator user group permission error is fixed.
changed the header as the last version had to many items in one space.