fixed random
various improvement to azienda
Creation of CaratteristicheCittadino class
Merge upstream/master

Conflicts:
	src/lifefluxzwei/LifeFluxZwei.java

Union with Carlo's