Handle broken android versions that do not accept null number format for
progress dialogs
Ensure default bookshelf is really set.
Merge pull request #477 from Grunthos/master

Minor bug fixes