Corrections

Corrections to bring Repo in line with manual
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/cart_config.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/cart_config.php