removed dataobjectmanager dependency
after automated upgrade script
some more changes, still not complete
simple TODO list
template updates to 3.1