synchronization with beta branch
Merge branch 'master' into beta

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

Conflicts:
	src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
formatting
XMLSerializer: exception management simplified
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/fbreader/book/XMLSerializer.java
reordering members
members reordering
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/fbreader/book/Bookmark.java
synchronization with master branch
formatting