basemodel and mediator created
mediator and modelBase updated
mediator edited
mediator edited 2
inheritance corrected
mediator and base model prepared to merge to develop