edit properties
Merge branch 'master' of github.com:rangambr/GVPD