Made switching room calendars not destroy the website!
Merge branch 'master' of https://github.com/JJMcConnell/Software-Engineering-Project
Made loading screens work.
Merge branch 'master' of https://github.com/JJMcConnell/Software-Engineering-Project