fixed a minor bug and sqlite tests
typo fix
fixed merge conflicts
Merge branch 'master' of github.com:meetings/gearsloth