03082014 2235
04082014 17:15 Tipos de pago
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
Merge origin/master into Phase-II-Sales-Implementation

Conflicts:
	faces-navigation.NavData
	src/main/resources/META-INF/persistence.xml