modif
Merge

Conflicts:
	www/js/calculos.js