Database with subclasses and image analysis implemented
Merge branch 'master' into paul-src