cleanup
imports cleanup
Merge branch 'master' into nook

Conflicts:
	src/org/geometerplus/zlibrary/core/application/ZLKeyBindings.java
Merge branch 'nook' into nook-keys