added unique roomIDs
Merge branch 'master' of https://github.com/OpenComm/OpenComm-Group

Conflicts:
	Spring2013/OC-AndroidApp/src/edu/cornell/opencomm/model/ConferenceRoom.java