Participant/User tracking kind of works
Merge commit '25ed41db4a432dc78ee15980ca3bc587b7ba63e1' into backupA

Conflicts:
	src/src/edu/rit/acn/ccnTextConf/model/UserList.java
	src/src/edu/rit/acn/ccnTextConf/test/SimpleConfTest.java