the product browse
Merge remote-tracking branch 'refs/remotes/origin/develop' into develop

Conflicts:
	sites/all/themes/nickandersonart/css/styles/style.css