Resolve merge conflict
Use SQLite for development by default
Merge branch 'master' of https://github.com/sosol/sosol