060814 18:22 Itinerario
060814 18:22 Itinerario
060814 18:22 Itinerario
060814 18:22 Guia
Merge origin/Phase-II-Sales-Implementation into Phase-II-Sales-Implementation

Conflicts:
	faces-navigation.NavData
	src/main/java/com/simphony/entities/Guide.java
	src/main/java/com/simphony/entities/Sale.java
	src/main/java/com/simphony/managedbeans/SaleBean.java
	src/main/java/com/simphony/repositories/GuideRepository.java
	src/main/webapp/catalogs/itineraries/add.xhtml
Merge origin/Phase-II-Sales-Implementation into Phase-II-Sales-Implementation

Conflicts:
	faces-navigation.NavData
	src/main/java/com/simphony/entities/Guide.java
	src/main/java/com/simphony/entities/Sale.java
	src/main/java/com/simphony/managedbeans/SaleBean.java
	src/main/java/com/simphony/repositories/GuideRepository.java
	src/main/webapp/catalogs/itineraries/add.xhtml
Merge origin/Phase-II-Sales-Implementation into Phase-II-Sales-Implementation

Conflicts:
	faces-navigation.NavData
	src/main/java/com/simphony/entities/Guide.java
	src/main/java/com/simphony/entities/Sale.java
	src/main/java/com/simphony/managedbeans/SaleBean.java
	src/main/java/com/simphony/repositories/GuideRepository.java
	src/main/webapp/catalogs/itineraries/add.xhtml
Merge origin/Phase-II-Sales-Implementation into Phase-II-Sales-Implementation

Conflicts:
	faces-navigation.NavData
	src/main/java/com/simphony/entities/Guide.java
	src/main/java/com/simphony/entities/Sale.java
	src/main/java/com/simphony/managedbeans/SaleBean.java
	src/main/java/com/simphony/repositories/GuideRepository.java
	src/main/webapp/catalogs/itineraries/add.xhtml