Let's see whether we really need to explicitly set the static files settings
Merge branch 'master' of https://github.com/nbudin/precon-project into nbudin-master

Conflicts:
	precon_project/precon_project/settings/production.py