差异
差异
修改字符串提示，使用xml中字符串

<string name="wait">正在刷新&#8230;</string>
<string name="net_error">网络连接错误</string>
<string name="error">数据读取失败</string>
<string name="empty">没有符合条件的数据<string>
修改strings.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/net/chinawuyue/mls/board/BoardReport.java
	src/net/chinawuyue/mls/login/LoginActivity.java
	src/net/chinawuyue/mls/sys/ChangePwd.java