nivel de bateria y alarma con boton de on
commit
Merge branch 'agregar-bateria' into arreglar-boton

Conflicts:
	actionbarsherlock/bin/actionbarsherlock.jar