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

Conflicts:
	Spring2013/OC-AndroidApp/src/edu/cornell/opencomm/model/ConferenceDataModel.java
merge
Merge branch 'master' of https://github.com/OpenComm/OpenComm-Group
merge
Merge branch 'master' of https://github.com/OpenComm/OpenComm-Group
merge
Merge branch 'master' of https://github.com/OpenComm/OpenComm-Group

Conflicts:
	Spring2013/OC-AndroidApp/src/edu/cornell/opencomm/network/NetworkService.java
Merge branch 'master' of https://github.com/OpenComm/OpenComm-Group
updated ConferenceController_v2