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

Conflicts:
	bin/OneKey.apk
	bin/classes.dex
	bin/classes/com/ex/onekey/EncryptDecrypt.class
	bin/classes/com/ex/onekey/R$id.class
	bin/resources.ap_
	gen/com/ex/onekey/R.java
	src/com/ex/onekey/EncryptDecrypt.java
update
update