Property translator
Merge branch 'master' of github.com:DisCODe/DisCODe
diswizard fix