Merge remote-tracking branch 'refs/remotes/aokp/jb-mr1' into cm-10.1

Conflicts:
	AndroidManifest.xml
	res/drawable-xhdpi/ic_rom_control_navigation_ring.png
	res/values-cs/strings.xml
	res/values-es/strings.xml
	res/values-hu/strings.xml
	res/values-ja/strings.xml
	res/values-ko/arrays.xml
	res/values-ko/strings.xml
	res/values-tr/arrays.xml
	res/values-tr/strings.xml
	res/values-zh-rCN/strings.xml
	res/values/arrays.xml
	res/values/dimens.xml
	res/values/strings.xml
	res/xml/prefs_about.xml
	res/xml/prefs_navbar.xml
	res/xml/prefs_navring.xml
	res/xml/prefs_powermenu.xml
	res/xml/prefs_statusbar_toggles.xml
	res/xml/prefs_ui.xml
	src/com/aokp/romcontrol/fragments/Lockscreens.java
	src/com/aokp/romcontrol/fragments/NavRingTargets.java
	src/com/aokp/romcontrol/fragments/Navbar.java
	src/com/aokp/romcontrol/fragments/PowerMenu.java
	src/com/aokp/romcontrol/fragments/Sound.java
	src/com/aokp/romcontrol/fragments/StatusBarToggles.java
	src/com/aokp/romcontrol/fragments/UserInterface.java
	src/com/aokp/romcontrol/fragments/WidgetConfigurationFragment.java
	src/com/aokp/romcontrol/service/ExternalCommandService.java
	src/com/aokp/romcontrol/util/Helpers.java

Change-Id: I8010edd3f77c3dcc99496bbdc5ed781352c43913