更新pm依赖库
添加了pm2.5的模型预测交互
Merge branch 'master' of
https://github.com/bnrcParticipationSense/theSense.git

Conflicts:
	src/com/bupt/bnrc/thesenser/RecordThread.java
modeltask predicttask增加接口
。。
Merge branch 'master' of
https://github.com/bnrcParticipationSense/theSense.git

Conflicts:
	gen/.gitignore
	gen/com/bupt/bnrc/thesenser/R.java
	src/com/bupt/bnrc/thesenser/CameraActivity.java
	src/org/pm4j/task/ModelingTask.java
	src/org/pm4j/task/PMConfig.java
	src/org/pm4j/task/PredictingTask.java
	src/org/pm4j/task/PreprocessingProcess.java
predictionmodel接口更改
添加了sd卡存储数据库，添加了一个上传照相机
Merge branch 'master' of https://github.com/bnrcParticipationSense/theSense.git
test
test修改
Merge branch 'master' of
https://github.com/bnrcParticipationSense/theSense.git

Conflicts:
	gen/com/bupt/bnrc/thesenser/R.java
	src/com/bupt/bnrc/thesenser/Collection.java
	src/com/bupt/bnrc/thesenser/MainActivity.java
	src/com/bupt/bnrc/thesenser/TestFragment.java
	src/com/bupt/bnrc/thesenser/utils/Upload.java