Continues update
Merge branch 'master' of github.com:khoamisfit/demodjango