imports cleanup
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/zlibrary/text/view/ZLTextView.java
imports cleanup
Merge branch 'master' into beta
imports cleanup
Merge branch 'master' into beta
imports cleanup
Merge branch 'master' into beta
imports cleanup
Merge branch 'master' into beta
imports cleanup
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
imports cleanup
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
compilation issue
imports cleanup
Merge branch 'master' into beta
imports cleanup
Merge branch 'master' into beta