3.5

3.5
Merge branch 'master' of https://github.com/hebijiandai/GoodDjango

Conflicts:
	blog/admin.pyc