some updates
update readme
Merge branch 'master' into develop

Conflicts:
	README.mkd
	locale/zh_CN/LC_MESSAGES/xmpptalk.mo
	po/messages.po
	po/zh_CN.po