Settings: Chamber of Secrets (2/2) [WIP]

PS2: Rebase

Change-Id: I4bee793580fe32b022cf7cbfc7ca5195d2c9a434
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	res/values/bs_strings.xml
	res/xml/development_prefs.xml
	src/com/android/settings/DevelopmentSettings.java

Conflicts:
	res/values/bs_strings.xml
	src/com/android/settings/DevelopmentSettings.java