imports cleanup
Merge branch 'master' into beta

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

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

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

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

Conflicts:
	res/layout/navigate.xml
	src/org/geometerplus/android/fbreader/NavigationPopup.java
deleted commented code
formatting
formatting