data base connection repaired
Merge branch 'master' into database_connection_branch
Datamodel created.