Merge branch 'develop'
Add dj_database_url requirement for production env.
Add collectstatic command on web process definition.
Change admin and time zone.
Add file header.
Change wsgi configuration to serve static files.
Merge branch 'static-files'
Add dj_static requirement to production env.
Merge branch 'add-dj_static'
Add --noinput paramenter in collectstatic command.
Merge branch 'fix-procfile'
Merge branch 'develop'

Conflicts:
	poppurri/poppurri/settings/production.py
	poppurri/poppurri/wsgi.py
Merge branch 'develop'
Add fixtures with fake data into applications. Closes #5.

* Add fake media.
* Add initial data for mixture and category apps.
Retore format to navigation links.
Add category & mixture matches into search result view. Closes #3.

* Restore format to navigation links.
* Add style to fix position of 'search' text.
* Add class Searchable.
* Add implementation for searchable models.
* Change search queryset using search() method on manager.
* Add h1 header level to category name.
* Crop photos on carousel in home.
* Add category results to search view.
Add category & mixture matches into search result view. Closes #3.

* Restore format to navigation links.
* Add style to fix position of 'search' text.
* Add class Searchable.
* Add implementation for searchable models.
* Change search queryset using search() method on manager.
* Add h1 header level to category name.
* Crop photos on carousel in home.
* Add category results to search view.
Add thumbnail presentation and modal for images. Closes #7

* Add holder.js library to create fake thumbnails.
* Change thumbnail format in mixture detail.
* Add modal for images.
Add breadcrumbs in all pages. Closes #14.
Merge branch 'develop'

Conflicts:
	poppurri/templates/category_detail.html