updated sql issues causing triple order totals showing on cart page
cod not showing, initial order etc
Merge branch 'B1521' of github.com:loadedcommerce/loaded7 into B1521

Conflicts:
	catalog/install/loadedcommerce.sql
	catalog/install/loadedcommerce_innodb.sql
	catalog/install/loadedcommerce_sample_data.sql
Merge pull request #264 from loadedcommerce/B1521

B1521