Merge origin/master

Conflicts:
	pom.xml
	src/main/resources/messages_es.properties
	src/main/webapp/catalogs/itineraries/add.xhtml
	src/main/webapp/catalogs/itineraries/list.xhtml