cleanup
synchronization with beta branch
Merge branch 'master' into beta
Merge branch 'master' into ice-cream-sandwich

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

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

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

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

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
Merge branch 'yota2' into betayota
Merge branch 'yota2' into beta-ics
Merge branch 'beta-ics' into betayota
Merge branch 'betayota' of github.com:geometer/FBReaderJ into betayota