BookmarksActivity optimization
BookmarksActivity optimization
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/BookmarksActivity.java
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
Georgian localization
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
Georgian added to the language list
interface language option
Merge branch 'master' into ice-cream-sandwich
formatting
Merge branch 'master' into beta

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

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java