Merged remote
Merge branch 'master' of github.com:alendit/exedjango