Simplify Grid/List View
Merge branch 'master' of git://github.com/gburton/osCommerce-234-bootstrap

Conflicts:
	custom.css
	includes/modules/header_tags/ht_grid_list_view.php
	install/oscommerce.sql
Merge branch 'master' of github.com:newburns/osCommerce-234-bootstrap-wADDONS