Small clean up

-Rearrange a few options and tabs
-Clean up some strings
-Move Show 4G icon option from Wireless Settings to Statusbar -> General tab

Conflicts:
	res/values/strings.xml
	src/com/crom/settings/fragments/statusbar/StatusBarGeneral.java
Change-Id: I680ef89244587d13229ab9712b1aaa68e69c1f9e