Bug Fixes

Swiping, loading, and notifications bug fixes
Merge remote-tracking branch 'origin/master'

Resolved conflicts with APK