国际化
Merge branch 'new-web' of https://github.com/gokuai/fengcloud into new-web

Conflicts:
	app/scripts/chat.js
国际化