Merge origin/master

Conflicts:
	src/cryptohelper/GUI/UC2/AreaLavoroPanel.java
Merge origin/master