Fix all major local issues
This merge readies the local version of the app for launch, the notification related features still need testing.
This merge readies the local version of the app for launch, the notification related features still need testing.