linea base
Merge remote-tracking branch 'origin/master'

Conflicts:
	demo_project/demo_app/templates/HtmlTipoItem/tipoitemtofase.html