重新测试，提交一遍
Merge branch 'master' of https://github.com/cobish/dehou

Conflicts:
	backend/__init__.pyc
	backend/form.pyc
	backend/models.pyc
	backend/templates/admin_add.html
	backend/urls.pyc
	backend/views.py
	backend/views.pyc
	settings.pyc
	urls.pyc
	wsgi.pyc