Book room is now working properly
Merge remote-tracking branch 'origin/master' into BakkanBranch