Delete language.settings.xml
unstage language.settings
Merge branch 'master' of https://github.com/optimad/PABLO.git
Merge branch 'master' of local repository into sviluppo

Conflicts:
	.settings/language.settings.xml