synchronization with yota2 branch
Merge branch 'ice-cream-sandwich' into yota2

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