formatting
imports cleanup
search works for network dialogs
synchronization with nook branch
Merge branch 'master' into nook
synchronization with nook branch
Merge branch 'master' into nook

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