2 pages view
Merge branch 'master' into 2pages

Conflicts:
	src/org/geometerplus/zlibrary/text/view/ZLTextView.java
fixed column width
Merge branch 'master' into 2pages

Conflicts:
	src/org/geometerplus/zlibrary/text/view/ZLTextView.java
Merge branch 'master' into 2pages

Conflicts:
	src/org/geometerplus/zlibrary/text/view/ZLTextView.java
2 columns: text selection
Merge branch 'master' into 2pages

Conflicts:
	src/org/geometerplus/zlibrary/text/view/ZLTextView.java
Merge branch 'master' into 2pages

Conflicts:
	src/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java
2-column mode options
updated TODO
page numbering in 2-column mode; end-of-section rpocessing in 2-column mode (in progress)
2-column view: fixed end-of-section processing, fixed backward scrolling
Merge branch 'master' into ice-cream-sandwich

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

Conflicts:
	src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics

Conflicts:
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
max space between columns value => 300
Merge branch 'master' into ice-cream-sandwich

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

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