Added Product and ProductTemplate
Merge branch 'master' of https://github.com/elijah755/ascobar

Conflicts:
	orders/models.py