synchronization with library-service branch
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into multidirs

Conflicts:
	src/org/geometerplus/fbreader/library/FileFirstLevelTree.java
Merge branch 'multidirs' into beta

Conflicts:
	src/org/geometerplus/fbreader/library/FileFirstLevelTree.java
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
synchronization with library-service branch
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'beta' into beta-ics
synchronization
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'beta' into beta-ics
no Book.save() call in native code
Merge branch 'master' into ice-cream-sandwich