merge FEED's sqlite code with libefgy
Merge remote-tracking branch 'github/master'