added some fresh local settings with django debug toolbar. I bet this breaks my development environment.
changed some things
Merge branch 'master' of github.com:elighcash/elighcash into test