12082014 013725 Ventas TripDate
Merge origin/Phase-II-Sales-Implementation into Phase-II-Sales-Implementation

Conflicts:
	pom.xml
	src/main/resources/META-INF/persistence.xml
15082014 013125
Bugs de venta - Horas erroneas, Agremiado en blanco, etc
Validacion en el numero de pasajeros
Merge origin/Phase-II-Sales-Implementation into Phase-II-Sales-Implementation

Conflicts:
	pom.xml
	src/main/resources/META-INF/persistence.xml