imports cleanup
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/fbreader/formats/NativeFormatPlugin.java
imports cleanup
imports cleanup
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
imports cleanup
Merge branch 'beta' into beta-ics
formatting
synchronization with beta branch
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	src/org/geometerplus/android/fbreader/NavigationPopup.java
	src/org/geometerplus/android/fbreader/PopupWindow.java
	src/org/geometerplus/android/fbreader/SelectionPopup.java
	src/org/geometerplus/android/fbreader/TextSearchPopup.java
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/PopupWindow.java
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
refactoring (synchronization with beta branch)
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	src/org/geometerplus/android/fbreader/PopupWindow.java
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/PopupWindow.java