synchronization with nook branch
code style cleanup
Merge branch 'master' into nook

Conflicts:
	src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java
code simplification
synchronization with nook branch
Merge branch 'master' into nook