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

Conflicts:
	src/org/geometerplus/android/fbreader/library/LibraryActivity.java
Merge branch 'master' into multidirs

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

Conflicts:
	src/org/geometerplus/android/fbreader/library/LibraryActivity.java
compilation issue
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
synchronization with library-service branch
Merge branch 'master' into multidirs
Merge branch 'master' into ice-cream-sandwich
Merge branch 'multidirs' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics