more cancel menu refactoring + code cleanup
code cleanup
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java