books db update: uids table, book labels instead of favorites
Merge branch 'master' into ice-cream-sandwich