修改设备加载页面超时
。
Merge branch 'chenyan'
修改
Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmserver/db/DBOpenHelper.java