repackaging: some classes moved to book package (synchronization with library-service branch)
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/library/BookInfoActivity.java
	src/org/geometerplus/fbreader/library/Library.java
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics