Controva, Passimici
Merge branch 'master' of https://github.com/edoardo90/scouthis

Conflicts:
	EclipseProg/Scouthis/bin/R.txt