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

Conflicts:
	templates/public/common/header.html
Merge branch 'master' of https://github.com/Maizhi/maizhi

Conflicts:
	templates/public/common/header.html
	templates/public/js/message.js
	templates/users/index.html
ok