Removed backup files
Merge branch 'master' of github.com:glipari/metasim2.0
Fabio: merging some changes from Peppe!