integrated event swipe
Merge branch 'feature-integrate-event-swipe'