Merge remote-tracking branch 'OR/master'

Conflicts:
	redspecies/settings/base.py
	redspecies/settings/dev.py
Merge remote-tracking branch 'origin/master'