x
Merge branch 'master' of ssh://github.com/ComputerEngineering/Sapienza
Merge branch 'master' of ssh://github.com/ComputerEngineering/Sapienza
Merge branch 'master' of ssh://github.com/ComputerEngineering/Sapienza

Conflicts:
	sapienza/res/layout/sim_lavoro_domandefrequenti.xml
	sapienza/res/values/strings.xml
	sapienza/src/com/pivetta/bacocco/sapienza/Fragment_sim_lavoro_Domande.java