New setting under "Debug settings" that enables the development shortcut

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

Change-Id: I9a43e611911f2e278605715f714860ad11236fd9

Conflicts:
	res/values/cm_strings.xml
	src/com/android/settings/DevelopmentSettings.java
Fix development settings

Change-Id: I3cdb9f995c13c12194283262bdc19f86e68b368d
Final fix hopefully

Change-Id: Ie0a7c5681a4e640119e4cef760113d8cbe1ddf3d