添加了照片墙和后台服务器的通信
为啥fail？
Merge branch 'master' of
https://github.com/bnrcParticipationSense/theSense.git

Conflicts:
	bin/classes/com/bupt/bnrc/thesenser/R$id.class
	gen/com/bupt/bnrc/thesenser/R.java
	src/com/bupt/bnrc/thesenser/utils/Upload.java
Merge branch 'master' of https://github.com/bnrcParticipationSense/theSense.git
添加了“建模功能”（半成品）
Merge branch 'master' of
https://github.com/bnrcParticipationSense/theSense.git

Conflicts:
	gen/.gitignore