Edm60 branch

This version uses the new edm-db-mysql domain model (modeled for mysql 5.6+).