update swipe nav
Merge branch 'dev'