28072014 183325 Cambios a ver
Merge origin/master

Conflicts:
	src/main/resources/messages_es.properties
28072014 183325 Cambios a verde
Merge origin/master

Conflicts:
	src/main/resources/messages_es.properties
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
28072014 184925 Eliminacion de combo boxes
Conflicts:
	src/main/webapp/resources/css/layout.css
	src/main/webapp/sale.xhtml