Remove sqlite3.
Merge branch 'flickr' into develop
Add back sqlite3.
Merge branch 'master' into develop
Fix path.
Add multiple markers.
Merge branch 'develop'