Merge origin/master

Conflicts:
	src/Reportes/newReport1.jrxml
Merge origin/master