最新国际化
Merge branch 'master' of https://github.com/gokuai/fengcloud

Conflicts:
	app/scripts/common.js