new plain formulas
Merge branch 'master' of github.com:Makazone/FormulaManager
merged db's