clean code
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/org/geometerplus/android/fbreader/ShowDialogMenuAction.java
Merge pull request #10 from dxwts/master

回归主干