Merge origin/master

Conflicts:
	src/cryptohelper/data/Mossa.java
Merge origin/master