before difficult merge

src/main/java/avatartranslator/AvatarDataType.java

src/main/java/avatartranslator/AvatarSpecification.java

...main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java

src/main/java/ui/AvatarDesignPanelTranslator.java