CSD-36: Code changes from Hongyu Shan
CSD-36: More changes to hours module from Hongyu Shan
Merge pull request #10 from UCLALibrary/staging

CSD-36
Merge pull request #12 from UCLALibrary/CSD-36

Csd 36