Errors 1 & 2 fixed

Addressed and fixed by mc12345678
Merge branch 'master' of https://github.com/DivaVocals/zen_BundleProducts

Conflicts:
	includes/classes/order.php
	includes/modules/pages/shopping_cart/header_php.php