Merge origin/master

Conflicts:
	src/cryptohelper/GUI/BozzePanel.java
Merge origin/master