CancelActivity refactoring
synchronization with master branch
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
FBReaderApp does not save cancel actions list
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
code cleanup
Merge branch 'master' into beta