foramtting
formatting
Merge branch 'master' into cover_transfer_and_saving

Conflicts:
	src/org/geometerplus/zlibrary/core/image/ZLLoadableImage.java
	src/org/geometerplus/zlibrary/core/image/ZLSingleImage.java
formatting