db upd, img upd, other fixes
Merge branch 'master' of https://github.com/Makazone/FormulaBook