Listado de terminos de transporte
Ajustes
Merge branch 'master' of https://github.com/fwilchel/gip3

Conflicts:
	src/main/resources/com/ssl/jv/gip/web/mb/MessageResources_en.properties
	src/main/resources/com/ssl/jv/gip/web/mb/MessageResources_es.properties
	src/main/webapp/WEB-INF/.faces-config.xml.jsfdia