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

Conflicts:
	.settings/org.eclipse.core.resources.prefs