unused type casting
Merge branch 'master' into beta
decimal separator
Merge branch 'master' into beta

Conflicts:
	ChangeLog
	src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java