Merge branch 'develop'
Merge branch 'develop'
Merge branch 'add-start-script'
Merge branch 'add-start-script'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Set default datase for redis.
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Add python-memcached to production requirements.
Merge branch 'hotfix'
Merge branch 'develop'

Conflicts:
	poppurri/poppurri/settings/base.py