new yota icon; 'move to back/front' screen action moved in menu
Merge branch 'ice-cream-sandwich' into beta-ics

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
class ZLAndroidApplicationWindow has gone
Merge branch 'simplification' into simplification-ics

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
	src/org/geometerplus/zlibrary/core/application/ZLApplication.java
	src/org/geometerplus/zlibrary/ui/android/application/ZLAndroidApplicationWindow.java
ZLAndroidLibrary.getActivity() has gone
Merge branch 'simplification' into simplification-ics
no getField() call
Merge branch 'simplification'
Merge branch 'master' into beta

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

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
	src/org/geometerplus/zlibrary/ui/android/application/ZLAndroidApplicationWindow.java
Merge branch 'master' into ice-cream-sandwich
Merge branch 'beta' into beta-ics

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