修改了部分信息
Merge branch 'master' of
https://github.com/bnrcParticipationSense/theSense.git

Conflicts:
	src/com/bupt/bnrc/thesenser/PMToolsNetworkFragment.java
	src/com/bupt/bnrc/thesenser/utils/CommonDefinition.java
	src/com/bupt/bnrc/thesenser/utils/JSON.java