Merge branch 'develop' of https://github.com/InaneCoding/Piwik-OpenCart-Ecommerce-VQMod into develop

resolving conflict arising from commiting with "amend last commit"!
Conflicts:
upload/admin/language/english/module/piwik.php

Author: kevinb456