updates on settings and requirement
Merge branch 'master' of github.com:walterbrunetti/django_test
Merge with master