Merge pull request #28 from francarl/master

merge da francarlo
PropertyEditor
Merge branch 'master' of https://github.com/TeamBig/MonProvv
Merge pull request #37 from TeamBig/master

PropertyEditor