fbreader intents cleanup
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
	src/org/geometerplus/android/fbreader/library/BookInfoActivity.java
synchronization with ics branch
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle
compilation issues
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle
fixed key name
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle
fixed cancel menu
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle