ud
Merge branch 'master' of https://github.com/Alter93/OneKey

Conflicts:
	bin/classes/com/ex/onekey/EncryptDecrypt.class