Simplify Grid/List View
Merge branch 'master' into hg

Conflicts:
	includes/modules/product_listing.php