modifica
Merge branch 'develop'

Conflicts:
	index.html
Finish Release1
hotfix
Finish Hotfix1