+ finish task #298.
Merge branch 'master' of github.com:xirang/chanzhiips
 * finish task #298.

Conflicts:
	system/module/common/ext/lang/zh-cn/ips.php