Merge pull request #741 from garvankeeley/amend727

Amendment to 727, track locations when the activity is not showing.
Minor cleanup items from Kevin's last review. Changed Log.e() to correct
format, changed string concatenation to String.valueOf()
Bug: the alarm keeps getting rescheduled, and unless collection went
idle, the upload wasn't triggered. Added a flag to prevent this.
Some cleanup from the Fennec review before I add the timer to
periodically flush reports.
- fixed non-braced ifs
- /** -> /* on comments
- removed used of the word database that was in a few places
- synchronized on all public methods on DataStorageManager
Data storage: On idle, schedule a timer to flush to disk after a few mins.
This is to handle the case when collection stops and wifi not available
for uploading.