merge Test diario from webapi with master