events in styleguide changes
Merge remote-tracking branch 'origin/develop' into feature/events-modify
Merge pull request #436 from reciprocity/feature/events-modify

events in styleguide changes