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

Conflicts:
	bin/OneKey.apk
	bin/classes.dex
	bin/classes/com/ex/onekey/PantallaInicial.class
	bin/resources.ap_
	res/layout/activity_pantalla_detalle_clave.xml