[DF-3491] Disabled creation of custom properties at GetCustomProperties()
Merge branch 'framework_0_5_5' into framework_0_5_5_customprops
Merge branch 'framework_0_5_5' into framework_0_5_5_customprops
merged with framework_0_5_5
Merge branch 'framework_0_5_5' into framework_0_5_5_customprops
[DF-185] Merged development into framework_0_5_5_customprops
[DF-3491] Small refactoring after code-review
Merge branch 'development' into framework_0_5_5_customprops
[DF-185] merged development into framework_0_5_5_customprops
Merged with development
Merge branch 'development' into framework_0_5_5_customprops
Merge branch 'development' into framework_0_5_5_customprops
Merge branch 'development' into framework_0_5_5_customprops
[DF-185] Merged with development
[DF-185] Merged with development
Merge branch 'development' into framework_0_5_5_customprops
Merge branch 'development' into framework_0_5_5_customprops
Merge branch 'development' into framework_0_5_5_customprops