CBL Android: more updates for beta 2