clientInfo changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	tw2014/roomSelection.php