minor changes
Merge branch 'spiti' of github.com:Nacho-Libre/ceid_web_app into spiti

Conflicts:
	ceid/settings.py