project properties
Merge branch 'yemeng' into zhouqj

Conflicts:
	TouchLogger/src/zju/ccnt/xptools/view/MyWindowManager.java
Merge remote-tracking branch 'origin/dev' into zjw

Conflicts:
	TouchLogger/AndroidManifest.xml
	TouchLogger/src/zju/ccnt/xptools/MainActivity.java
	TouchLogger/src/zju/ccnt/xptools/mode/TouchDataModel.java
	TouchLogger/src/zju/ccnt/xptools/view/MyWindowManager.java
	TouchLogger/src/zju/ccnt/xptools/view/TraceView.java
Merge branch 'dev' into zjw

Conflicts:
	TouchLogger/src/zju/ccnt/xptools/view/TraceView.java
5.5
增加了同步模块框架
Merge remote-tracking branch 'origin/zjw' into zhouqj

Conflicts:
	TouchLogger/AndroidManifest.xml
	TouchLogger/src/zju/ccnt/xptools/MainActivity.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
增加了InputStream