fixed server error
Added json functions to database classes
Merge branch 'master' of https://github.com/bergzand/domos