fix
Merge branch 'master' of github.com:Chodex/djangodash2013
fix