fix some bugs

Graph dots color match Map Markers

Fix conflict

Fix bug attention is always 0 after resume

Hopefully fixes crash bug with MapFrag.onCreate()

Trashing Flurry, tested and confirmed that ACRA works, so we'll be moving on with that.

Trashing Flurry, tested and confirmed that ACRA works, so we'll be moving on with that.

Trying out Flurry

data instant fresh on summary and map screen

finish save or delete data on crashes

Summary location image changes & Fix crash on connection lost

Merge branch 'master' of https://github.com/jayprat95/MindMapper

fix minor problems

Beginning recording recovery work. When a recording is interrupted without being "saved", the next time the app is opened, a dialog box asks if the user wants to discard or keep the recording. I've already implemented the delete functionality, so now for the save functionality. What needs to be done is that when the user clicks to save the recording, the final annotation dialog that usually shows at the end of a recording should be shown. The user can then enter the final annotation in order to "save" the recording. Be sure to increment the session id afterwards, if needed.

[Recording] Corrected format for activity timer (Fixes #40)