not sure where we are here
Merge remote-tracking branch 'origin/master'

Conflicts:
	gspot/gspot/urls.py
	gspot/products/admin.py
	gspot/products/models.py
	gspot/products/views.py
conditional rendering of a template based on the product's class