Fix room editing with ajax
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Room and hotel editting. (Without image upload)