Fixed local settings importing
Fixed test settings to properly run
Merge branch 'master' of https://github.com/pythonbrasil/associados

Conflicts:
	associados/settings.py