購物通知信顯示訂單及配送地區

Conflicts:
	cart.php
Merge branch 'master2' into newtinymce