options
synchronization with nook branch
Merge branch 'master' into nook
synchronization with nook branch
Merge branch 'master' into nook

Conflicts:
	src/org/geometerplus/zlibrary/core/application/ZLKeyBindings.java
fixed catalog management activity behaviour
updated text
Merge branch 'master' into nook
version name