fixed customer_id
Merge branch 'master' of https://github.com/TheWijiBoard/CandyShop

Conflicts:
	application/controllers/shoppingcart.php