Added logging, database classes
Added some dynamic class handling
Merge branch 'master' into dev