fixed NPE in findViewById
fixed NPE in findViewById

Conflicts:

	src/org/geometerplus/android/fbreader/FBReader.java
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
merged master
missing import
Merge branch 'master' into ice-cream-sandwich