zhangjf 2014-09-24
修改页面编码集
Merge remote-tracking branch 'origin/master'

Conflicts:
	.settings/org.eclipse.core.resources.prefs
zhangjf 2014-09-24
1.修改后台用户无法显示问题