my django 1.0.0
Merge branch 'master' of https://github.com/seraph0017/max-x.net