Revert "Gonna get this shit merged one of these days."

This reverts commit 81e57ffb3efb273717416b15b6181fd121b8f319.
Revert "Fix merge derp"

This reverts commit da504bed347084f19a336f1803a631437161691c.
Development shortcut in StatusBar and Recent Panel

It enables the wipe data and application force close option in the
recent tasks list and in the notification area. These options will
be available only if the Development shortcut option is enabled.

Change-Id: Ia4e1d040e8eade5afe118dd62bc28c86381c03e6

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/menu/recent_popup_menu.xml
	packages/SystemUI/res/values/cm_strings.xml
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java