added marketing reports and also working on the dashboard
Merge branch 'master' of git://github.com/opencart/opencart.git

Resolved Conflicts:
	upload/admin/controller/common/dashboard.php
Fixed SQL queries for getEmailsByProductsOrdered and getTotalEmailsByProductsOrdered
(issue #742)
Merge pull request #750 from Eternity-Yarr/master

Issue #742 fix
updated the marketing tracking system.
changed the word views back to viewed for db compatibility
Update header.php
Update product.php
Update download.php
Merge pull request #756 from gob33/master

Resolve issue #738
update
added customer activity report
added activity report to dashboard. updated reports to use bootstrap for filtering.
more dashboard work done
more marketing work done
first part of the new design
more work done on the front side.
marketing work done
stylesheet renames and move arounds
Update return action validate to match database

In oc_return_action `name` is varchar(64)