try to fix sqlite
resolve conflict
resolve conflict
clean up things
fix appearing orphan menu
Merge pull request #6 from goFrendiAsgard/master

Merge fixes