Random Github Heads
Merge remote-tracking branch 'origin/master'

Conflicts:
	estore/application/controllers/customer_store.php
	estore/application/views/check_out.php