Discrepancy of Combos peso value and plan summary
Merge branch 'master' of https://github.com/globeestate11/estate

Conflicts:
	application/models/estate/cart_model.php