tip
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/r/html/temp-boot-white/roomV2.html
The input be entered that avoid submit after alert