services con funcionalidades y cambio a hibernate template para insertar barco
Merge branch 'master' of https://github.com/vnessi/aop

Conflicts:
	obligatorio1-arqui-livianas/src/uy/edu/ort/model/Arribo.java