just do it then
Merge remote-tracking branch 'origin/master'

Conflicts:
	estore/application/controllers/customer_store.php