committino con le cosine per la chat
Merge remote-tracking branch 'origin/master'

Conflicts:
	project.properties