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

Conflicts:
	bin/OneKey.apk
	bin/classes.dex
	bin/resources.ap_