fix build
remove duplicate added in last build fix
make mShowWifiName stay checked

Conflicts:

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