Added custom rooms to calendar
Merge branch 'master' of https://github.com/WilsonKJ/VUIISWebsite2014