Meld NetStats and Traffic meter together to one preference category

Change-Id: I0e4f14c7a977cba66f5fd1ffc848faada6704ec5

Conflicts:
	res/values-de/ck_arrays.xml
	res/values-de/ck_strings.xml
	res/values/ck_strings.xml
	res/xml/status_bar.xml
	src/com/android/settings/cyanogenmod/StatusBar.java