ads
Merge branch 'master' of https://github.com/gminaker/databases

Conflicts:
	views/customer/purchase_items.php