Database fixed, edit btns added, new entities created, files working with new entities
to complete merge