formatting
EncryptionMethod class moved to zlibrary
Merge branch 'master' into beta

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