merge with master

doc/SysMLSec/fig/autogen2_t1.svg

doc/SysMLSec/fig/autogen2_t2.svg

doc/SysMLSec/fig/autogen_fv.svg

doc/SysMLSec/fig/autogen_fv2.svg

doc/SysMLSec/fig/autogen_t1.svg

doc/SysMLSec/fig/autogen_t2.svg

doc/SysMLSec/fig/automaticgeneration.png

doc/SysMLSec/fig/mappedkeys.svg

doc/SysMLSec/sysmlsec_documentation.tex

modeling/DIPLODOCUS/SmartCardProtocol.xml

modeling/DIPLODOCUS/SmartCardProtocol_sec.xml

src/main/java/proverifspec/ProVerifOutputAnalyzer.java

src/main/java/tmltranslator/TMLModeling.java

src/main/java/tmltranslator/toavatar/TML2Avatar.java

src/main/java/ui/GTURTLEModeling.java

src/main/java/ui/HSMGeneration.java

src/main/java/ui/SecurityGeneration.java

...ain/java/ui/window/JDialogCryptographicConfiguration.java

src/main/java/ui/window/JDialogProverifVerification.java