more custom field work done
Merge branch 'master' of https://github.com/opencart/opencart
changed the system to use vqmod

https://github.com/mhcwebdesign/opencart-oe/blob/master/upload/system/engine/modification.php
more vqmod work done
more vqmod stuff done
Double "a" tag color in css file
updated the vqmod code but i'm probably going to undo the vqmod changes and use the system i had before. vqmod seems to have to many features that are just not required.
vqmod removed, using my own again
Added If used information page by return terms, show warning message.
Merge branch 'master' of git@github.com:opencart/opencart.git
Update to the install.txt - changed a few instructions to be more clear and also the version number.

This should be moved to a GitHub md file.
Merge pull request #1328 from eka7a/master

Fixed if used information page by return terms, show warning message.
Fixed undefined notice for profile description in cart.

Fixes: #1297
Added isset check on get variable for coupon and voucher redirect action.
Updated README.md
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into ocshop-2.0

Conflicts:
	README.md