Swipe functionality into navbar buttons.
Conflicts.
Merge remote-tracking branch 'extendedmind/master'