Add price field on mixture.
Merge branch 'develop' into release-6. Refs #39.

Conflicts:
	poppurri/mixture/models.py