Merge working branches into master and delete old ones
Branches that are to be merged:
-SINERGIEN-neu
-EnumInitialisation
(also in CIMRefactorer)
-alias-search-path
(also in CIMUnmarshallingGenerator)
-exception
Branches that are to be deleted:
-SINERGIEN
-IEC61968
-fix-windows