aa
Merge branch 'master' of
https://github.com/bnrcParticipationSense/theSense.git

Conflicts:
	gen/com/bupt/bnrc/thesenser/R.java