Turn nav bar into a preference category

Conflicts:

	res/values/cr_strings.xml

(cherry picked from commit 0fc69970d607dbd917a373f4fa4604bcd81159a1)

Conflicts:
	res/xml/button_settings.xml
Development Settings: Reenable Nuplayer

* Nuplayer is now the default in Lollipop, do not uncheck the setting when disabling developer options.

Change-Id: Ic47365192404a866434630a7a4f2f669b8f80233

Conflicts:

	src/com/android/settings/DevelopmentSettings.java

(cherry picked from commit 6d23917403ebc1d02f285340679a48b2fa70aa5d)
App Circle Sidebar: Support for Configurable Trigger Region [2/2]

Conflicts:
	res/values/custom_strings.xml
	res/xml/app_circle_sidebar.xml
	src/com/android/settings/materialnexus/AppCircleSidebar.java
App Circle Sidebar: Support for Configurable Trigger Region [2/2]
Development Settings: Reenable Nuplayer use Switch now