30072014 022625  Itinerarios y detalle de itinerarios
30072014 191825 Sales y Login
Merge origin/master
28072014 184925 Eliminacion de combo boxes
Conflicts:
	src/main/webapp/resources/css/layout.css
	src/main/webapp/sale.xhtml
30072014 181025 Sales Guide
Merge origin/master
28072014 184925 Eliminacion de combo boxes
Conflicts:
	src/main/webapp/resources/css/layout.css
	src/main/webapp/sale.xhtml
30072014 190825 Sales Guide
Merge origin/master
28072014 184925 Eliminacion de combo boxes
Conflicts:
	src/main/webapp/resources/css/layout.css
	src/main/webapp/sale.xhtml
01082014 014625  DetalleItinerarios
01082014 152725 Ventas (Validation)
Merge origin/master
28072014 184925 Eliminacion de combo boxes
Conflicts:
	src/main/webapp/resources/css/layout.css
	src/main/webapp/sale.xhtml
02082014 151625  Guarda Guia Catalogo de asientos (Preparando la venta)
02082014 213425  Guarda Guia Catalogo de asientos (Preparando la venta)
Imagen de seleccion de asientos
03082014 121625  Seleccion de asientos
01082014 152725 Ventas (Validation)
Merge origin/master
28072014 184925 Eliminacion de combo boxes
Conflicts:
	src/main/webapp/resources/css/layout.css
	src/main/webapp/sale.xhtml
04082014 17:15 Tipos de pago
Merge origin/master into Phase-II-Sales-Implementation

Conflicts:
	faces-navigation.NavData
	src/main/resources/META-INF/persistence.xml
Merge origin/master into Phase-II-Sales-Implementation

Conflicts:
	faces-navigation.NavData
	src/main/resources/META-INF/persistence.xml
04082014 17:15 Tipos de pago II
Merge origin/Phase-II-Sales-Implementation into Phase-II-Sales-Implementation

Conflicts:
	src/main/java/com/simphony/beans/PayTypeService.java
	src/main/java/com/simphony/entities/PayType.java
	src/main/resources/META-INF/persistence.xml
Merge origin/Phase-II-Sales-Implementation into Phase-II-Sales-Implementation

Conflicts:
	src/main/java/com/simphony/beans/PayTypeService.java
	src/main/java/com/simphony/entities/PayType.java
	src/main/resources/META-INF/persistence.xml
03082014 121625  Seleccion de asientos
Merge origin/Phase-II-Sales-Implementation into Phase-II-Sales-Implementation
05082014 123725  Tipo pago I
050814 19:36 Itinerario Sin detalle