Fix mixture-detail-by-slug view name in reverse.
Merge branch 'hot-fix' into develop
Fix query search for translated fields.
Merge branch 'fix-query-search' into develop
Add search description and format to search result.
Merge branch 'pretty-search-result' into develop
Category list page showing description but not images. Closes #16.

* Change from TemplateView to ListView in Category.
* Change category list format.
Merge branch 'issue#16-category_image_and_description' into develop
Fix home titles and links.

* Add custom CSS for home page.
* Add buttons and titles into home.
Merge branch 'better-home' into develop
Add contact form into home and mixture detail. Closes #13.

* Fix home titles and links.
* Add custom CSS for home page.
* Add buttons and titles into home.
* Add django-contact-form to base requirements.
* Add contact form.
* Remove unused setting.
* Add django-contact-form URL conf.
* Add contact form links.
* Add contact form in home and mixture detail.
* Move environment settings into base.
* Add pending template formats for contact_form.
* Add logger configuration and default email settings.
Merge branch 'issue#13-contact_form' into develop

Conflicts:
	poppurri/templates/index.html
Merge branch 'develop'

Conflicts:
	poppurri/poppurri/settings/production.py