2g/3g toggle

Change-Id: I5dcace38de2631643bea62d908ced9e46db10205

Conflicts:

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