Merge pull request #9 from dxwts/master

回归主干
fix compling error
Merge remote-tracking branch 'origin/master'

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