Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Linnea
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Linnea
Fixing themes
Updating theming files
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Linnea
Updating views
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Linnea
Fixed auto adjusting category panel height
Apparently nobr tags are not browser friendly. Updated with span and class.
Adding modules/theming files
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Samantha