henshinTGG: refactoring
Merge branch 'MainDevelopment' into MainDevelopment2