Merge origin/graficos into graficos

Conflicts:
	nbproject/project.properties
	src/model/Combinado.java
	src/view/TablaCombinado.java