My version path changed.
change the path
修改了model
4.18 获取数据
Update gitignore and upload project Experience
create TOuchDataService
4.19 实现数据收集
4.21 测试
test
4.21 Json
project properties
Merge branch 'yemeng' into zhouqj

Conflicts:
	TouchLogger/src/zju/ccnt/xptools/view/MyWindowManager.java
commit merged files to this branch
Finish TouchDataService

20140422
Chang propertiese .
change file gitignore
properity changes
change gitignore
change gitignore
Merge remote-tracking branch 'origin/zhouqj' into yemeng

Conflicts:
	.gitignore
	ExperienceService/.classpath
	ExperienceService/src/ccnt/experience/service/DeviceInfoService.java
	ExperienceService/src/ccnt/experience/service/TouchDataService.java
	TouchLogger/src/zju/ccnt/xptools/view/MyWindowManager.java