CheckBoxPreference mShowWifiName should not be private

Conflicts:

	src/com/android/settings/cyanogenmod/SystemSettings.java