merge
Merge branch 'master' into dev
Refactoring UIBuilder code generator
UIBuilder code generator refactoring still in progress
xml attributes like `prop1:Class1-prop2:Class2-prop3` are processed correctly now
Merge branch 'dev'