agrego django lockdown y emprolijo el settings.py
Merge branch 'master' of github.com:jfunez/poliwall

Conflicts:
	poliwall/requirements.txt