fixed connection and notifying bugs and introduced new bugs...
Bug fix: App no longer tries to send data to the server when it's not connected
Fixed bug: Bugs from last commit is now fixed.
Merged