Added 2 new classes to the database mapping
Merge branch 'master' of https://github.com/NomeAutomation/NomeAutomation