Merge branch 'labsoc_sec' into 'master'

src/main/java/ui/GTMLModeling.java

src/main/java/ui/GTURTLEModeling.java

src/main/java/ui/TGComponentManager.java

src/main/java/ui/tmldd/TMLArchiFirewallNode.java

src/main/java/ui/tmldd/TMLArchiHWANode.java