Merge branch 'master' of git@github.com:ComputerEngineering/Sapienza.git

Conflicts:
	sapienza/.settings/org.eclipse.jdt.core.prefs
	sapienza/AndroidManifest.xml
	sapienza/res/values/strings.xml