Updated settings.py to include localsettings.py
Merge remote-tracking branch 'origin/master'