buzhidao
Merge branch 'master' of https://github.com/Maizhi/maizhi

Conflicts:
	templates/users/setting.html