Risoluzione conflitto
Merge branch 'master' of https://github.com/asupdev/asup.git
Merge branch 'master' of https://github.com/asupdev/asup.git
Merge branch 'master' of https://github.com/asupdev/asup.git
Merge branch 'master' of https://github.com/asupdev/asup.git
Issue #16