ADD::wait Room master
Merge branch 'wangyujue/LeapBand' of github.com:hukewei/leapband into wangyujue/LeapBand

Conflicts:
	src/fr/utc/leapband/sma/UserContainer.java