TerminoIncotermXMedioTransporte
Merge branch 'master' of
https://juancho1280:abril1980@github.com/fwilchel/gip3.git

Conflicts:
	src/main/java/com/ssl/jv/gip/negocio/ejb/MaestrosEJB.java
	src/main/java/com/ssl/jv/gip/negocio/ejb/MaestrosEJBLocal.java
Corrigiendo GIT!!!!!
Termino Incoterm x Medio Transporte
Merge branch 'master' of
https://juancho1280:abril1980@github.com/fwilchel/gip3.git

Conflicts:
	src/main/java/com/ssl/jv/gip/negocio/ejb/MaestrosEJB.java
	src/main/java/com/ssl/jv/gip/negocio/ejb/MaestrosEJBLocal.java
	src/main/webapp/WEB-INF/.faces-config.xml.jsfdia
	src/main/webapp/WEB-INF/faces-config.xml