inject class resolver into models
Merge branch 'master' into test/relations
update parents draft1