Merge branch 'develop' into release-6
Change price text if mixture's price is not defined.
Fix return data type on templatetag.
Merge branch 'release-6' into develop