28072014 19:5925 verde sera
Merge origin/master
28072014 184925 Eliminacion de combo boxes
Conflicts:
	src/main/webapp/resources/css/layout.css
	src/main/webapp/sale.xhtml