Move Superuser header below Developer Options

Change-Id: Ica85aae0d3f06e6c5e837946cfc893d9e2f4fb7d
Merge remote-tracking branch 'github/cm-10.1' into jb-mr1

Conflicts:
	res/xml/settings_headers.xml

Change-Id: I86aa75c8498839c01f1e84f35f01034a2677d9dc