merge
Merge branch 'SP13_refactor' of https://github.com/OpenComm/OpenComm-Group into SP13_refactor
integrated conference with conferenceview, un-subclassed multiuserchat