settings.py-dev -> settings.py + handling of settings_local
Merge branch 'master' of github.com:Psycojoker/abrakadaban