Changed DatabaseObject from intarface to class,
Merge remote-tracking branch 'origin/master'