15 cambio
Merge remote-tracking branch 'origin/devel' into devel

Conflicts:
	index.html