pre merge commit
Merge branch 'master' of https://github.com/Kalliope/minica.git into
mymaster

Conflicts:
	org.jcryptool.visual.jctca/src/org/jcryptool/visual/jctca/listeners/SigVisPluginOpenListener.java