synchronization with cover_sync branch
Merge branch 'master' into beta
synchronization with covers_sync branch
Merge branch 'master' into beta

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