28072014 21:3225 Menus, ventas
Merge origin/master
28072014 184925 Eliminacion de combo boxes
Conflicts:
	src/main/webapp/resources/css/layout.css
	src/main/webapp/sale.xhtml
29072014 190925 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
29072014 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 014125 Login, Ventas Itinerarios
Merge commit '58cbdfdab1ad2cfd10268f0f3d76e9525dca53e7'
30072014 020825  Itinerarios y detalle de itinerarios