merge
Merge branch 'SP13_refactor' of https://github.com/OpenComm/OpenComm-Group into SP13_refactor

Conflicts:
	Spring2013/OC-AndroidApp/src/edu/cornell/opencomm/view/ConferenceView.java
Merge branch 'SP13_refactor' of https://github.com/OpenComm/OpenComm-Group into SP13_refactor

Conflicts:
	Spring2013/OC-AndroidApp/src/edu/cornell/opencomm/view/ConferenceView.java
Merge branch 'SP13_refactor' of https://github.com/OpenComm/OpenComm-Group into SP13_refactor
user lists in conference controller and conference model