修改了进入多层界面退出后loadActivity界面一直转圈圈
修改了第一次设置路由器成功之后进入路由器界面后返回事件
Merge branch 'chenyan'
Merge remote-tracking branch 'origin/master' into chende

Conflicts:
	src/com/chainton/pdmclient/LoadingActivity.java