...
.......
Merge branch 'bfx', risolto conflitto README ... !!!

Conflicts:
	README