imports order

Conflicts:

	src/org/geometerplus/android/fbreader/library/BookInfoActivity.java
Merge branch 'master' into beta