setting fix
Merge branch 'master' of https://github.com/qs/crowd-predict

Conflicts:
	project/settings.py