fix settings
Merge branch 'master' into deploy
Merge branch 'deploy'
fix production settings
rename project
Merge branch 'master' of github.com:SrgyPetrov/djangodash2013