fixed possible exception
cleanup
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
compilation issues (duplicated fields/methods)
fixed #122: start/stop screen wakelock in onWindowFocusChanged (not in onResume/onPause)
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta

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