Change display of position history to line instead of markers
Synch & download file from server. Uncompressing after downloading
changes after failed automatic merge
UI Improvement: Action bar; Navigation drawer, Buttons
Merge conflicts
Merge conflicts
Merge conflicts
Made instance variables non-static, added function to overload database for testing
Merge with cmu/master
Use test database instead of default one in tests
Revert BaseActivity to near cmu/master state
Implement tests for js interface functions instead of going through the JS itself

Major code cleanup
Hijack onlocationchanged event instead of using mock locations
Revert TrailScribe app to be closer to cmu/master