Merge origin/master

Conflicts:
	src/cryptohelper/com/GUIController.java
Merge origin/master