More Event feature changes related to GSB Event view changes
Merge branch 'master' of github.com:gsbitse/gsb_feature_event