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

Conflicts:
	src/org/geometerplus/android/fbreader/util/AndroidImageSynchronizer.java
introduces intermediate class ZLImageSelfSynchronizableProxy
Merge branch 'master' into beta
refactoring
synchronization with beta branch
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/util/AndroidImageSynchronizer.java