fixed joining of rooms
Merge branch 'pbmasigla'
fixed empty value attempts
Merge branch 'pbmasigla'