add commit
add some change for wechat
Merge branch 'master' of https://github.com/nnjme/reindeer_server

Conflicts:
	Locale/chs/LC_MESSAGES/user.po