Se crea nueva forma Editar,
Merge remote-tracking branch 'origin/master'

Conflicts:
	Acuanet/Acuanet/InsertaLecturaE2.cs
REcuperacion y algo de limpieza
Merge branch 'master' of https://github.com/riickky45/Triton

Conflicts:
	Acuanet/Acuanet/OleadaR2.cs