Fix shopping cart in order delivery
Merge remote-tracking branch 'origin/master'

Conflicts:
	order_delivery.php
Merge branch 'master' of https://github.com/cep14-lsn/CEP-2014-Project

Conflicts:
	order_delivery.php
Merge branch 'master' of https://github.com/cep14-lsn/CEP-2014-Project