+ Blog: 添加status
Merge branch 'master' of github.com:oneyoung/django-blog

Conflicts:
	html/templates/admin/edit.html