modifiche locali
Merge branch 'master' of https://github.com/stefanorg/zfb2

Conflicts:
	Vagrantfile