--fix db
Merge branch 'master' of https://github.com/Dyrk/TFN
fixes
fixes 2
Merge branch 'master' of https://github.com/Dyrk/TFN
fixes 3
Merge branch 'master' of https://github.com/Dyrk/TFN