synchronization with master branch
Merge branch 'beta' into beta-ics

Conflicts:
	src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java