added Union, added missing constructor in FilesInDir
Merge branch 'master' of https://github.com/siemens/omniproperties
Merge branch 'master' of https://github.com/siemens/omniproperties