Merge pull request #31 from TeamBig/master

gestione tipologiche
Fix varie
Fix varie
Conf per esercizio
Merge pull request #24 from francarl/master

merge da francarlo