merge zjw
nothing
Merge remote-tracking branch 'origin/zjw' into zhouqj

Conflicts:
	TouchLogger/AndroidManifest.xml
	TouchLogger/src/zju/ccnt/xptools/sync/SyncManager.java
	TouchLogger/src/zju/ccnt/xptools/sync/SyncRunnable.java
	TouchLogger/src/zju/ccnt/xptools/sync/TouchDataSyncRunnable.java
	TouchLogger/src/zju/ccnt/xptools/util/ConfData.java
	TouchLogger/src/zju/ccnt/xptools/util/FileUtil.java
	TouchLogger/src/zju/ccnt/xptools/util/JsonUtil.java
	TouchLogger/src/zju/ccnt/xptools/util/MyObjectOutputStream.java
	TouchLogger/src/zju/ccnt/xptools/view/TraceView.java
Merge remote-tracking branch 'origin/zjw' into zhouqj

Conflicts:
	TouchLogger/AndroidManifest.xml
	TouchLogger/src/zju/ccnt/xptools/http/ResponseHandler.java
	TouchLogger/src/zju/ccnt/xptools/sync/SyncManager.java
	TouchLogger/src/zju/ccnt/xptools/sync/TouchDataSyncRunnable.java
tmp
本地zjw分支reset到最新
Merge branch 'zjw' into zhouqj

Conflicts:
	TouchLogger/project.properties
	TouchLogger/src/zju/ccnt/xptools/TouchDataApplication.java
	TouchLogger/src/zju/ccnt/xptools/util/ConfData.java
5.7 上传deviceinfo
5.13 v1.0
5.14 增加开机启动
5.15 修复deiviceId为空bug
zqj