synchronization with master branch
synchronization with beta branch
Merge branch 'master' into beta
formatting
imports cleanup
Merge branch 'master' into beta

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