Issue #118, edit the controller according to the new database
Merge branch 'master' of https://github.com/BeshoSmile/Terasoft_14
Merge branch 'master' of https://github.com/BeshoSmile/Terasoft_14