Added getCount() for BaseDB stuff
Merge remote-tracking branch 'origin/material_develop' into material_develop