#161: facilities landing page - overlap issue
Merge branch '161-facilities-overlap'
#160: Group Exercise calendars not available in the menu
Merge branch '160-group-exercise-menu'
#151: Fix Spacing between Search and Division of Student Life on UI_Bar
Merge branch '151-osl-bar-spacing'
#169: Style Legend for Group Exercise calendar
Merge branch '169-style-group-calendar'
Merge branch 'feature/hours'
SASS didn't get committed
Merge branch '151.osl-bar-spacing'
Dev version of file_enity_link and a patch to make it work for taxonomy terms
Added render with a link to entity option for thumbnail
renamed patch file
Merge branch '138-139-link-on-image'
Merge branch 'master' into test