synchronization with beta branch
Merge branch 'master' into ice-cream-sandwich
repackaging
comment for new option
Merge branch 'master' into ice-cream-sandwich
code cleanup: synchronization with beta branch
Merge branch 'master' into ice-cream-sandwich

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