Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/zlibrary/text/view/ZLTextView.java
	src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/fbreader/fbreader/FBView.java
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/NavigationPopup.java
synchronization with master branch
Merge branch 'master' into beta
formatting
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/NavigationPopup.java
duplicate method
Merge branch 'master' into beta
Merge branch 'master' into beta
Merge branch 'master' into beta
Merge branch 'master' into beta
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
Merge branch 'master' into beta
Merge branch 'master' into beta
Merge branch 'master' into beta

Conflicts:
	AndroidManifest.xml
Merge branch 'master' into beta

Conflicts:
	ChangeLog
Merge branch 'master' into beta
Merge branch 'master' into beta