first commit branch

creation of new entities, fixed data fixtures