Move advanced reboot option to the Button section

Change-Id: I9f2de92f04c3b7c3acec2ea69fed89107b460589
Show devices connected to the WiFi hotspot(2/2)

Conflicts:

	res/values/cm_strings.xml
	src/com/android/settings/Settings.java

Change-Id: Icf51db5ae0204ed2bf153a5223aec986d3b496c4