version2
version5
version10
version12
Merge origin/master into Stefano

Conflicts:
	JavaApplication9/src/Gaa.java