Book room is now working properly
Merge remote-tracking branch 'origin/master' into BakkanBranch
Merge branch 'master' of github.com:chunfantasy/calendar into storage