code simplification
code simplification
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
synchronization with beta branch
Merge branch 'master' into beta
synchronization with beta branch
synchronization with master branch
Merge branch 'master' into beta