Sq lite

Merge SQLite branch into master.