Room and hotel editting. (Without image upload)
Merge remote-tracking branch 'origin/master'