boh
Merge remote branch 'origin/master'

Conflicts:
	app/views/products/our_products_by_category_room.html.erb
boh