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
Merge origin/master
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
27072014 142955 Cambios de look and feel
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
27072014 235855 Ventas itinerarios
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
28072014 000425: Ventas e itinerarios
Merge origin/master

Conflicts:
	src/main/java/com/simphony/repositories/PopulationRepository.java
	src/main/java/com/simphony/selectors/PopulationBox.java
	src/main/resources/messages_en.properties
	src/main/resources/messages_es.properties
	src/main/webapp/include/top-band2.xhtml
	src/main/webapp/resources/css/color.css
	src/main/webapp/sale.xhtml