Added database Robolectric tests
Merge branch 'map_view_v2' into database
Small updates, using FTS4 instead of 3
Small formating fixes
Merge branch 'database'