Removed localsettings.py from git tracking
Merge branch 'master' into registration