removed show button.
Merge branch 'editRoom' into develop