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

Conflicts:
	templates/public/js/message.js
Merge branch 'master' of https://github.com/Maizhi/maizhi
message.html  message.css