Added sqllite for Linux and OSX
Merge remote-tracking branch 'origin/master'