live update of rooms
merge from abhisek
merge from abhisek
Manual merge of dev_anpatel