Use a title for each control group.

Makes it easier to tell the groups apart.

Change-Id: Id6b6ae8ed2c50e78e4efcedea153220ff1e8b35f
Make high security PIN prompt consistent to normal PIN prompt.

Change-Id: Ie5ccfb6f3ac9bcba4776512a2cd977111c243c9e
Update German translation.

Change-Id: I55da609420e6d51fa846c73fda986d41660b9eb7
Fix assigning apps to navigation ring.

Change-Id: I78863dd1ea9b07b5cd4fa4fbedc8a4700abffabd
Merge "Fix assigning apps to navigation ring." into cm-10.2
Merge changes I55da6094,Ie5ccfb6f into cm-10.2

* changes:
  Update German translation.
  Make high security PIN prompt consistent to normal PIN prompt.
Merge "Use a title for each control group." into cm-10.2
Merge branch 'cm-10.2' of github.com:CyanogenMod/android_packages_apps_Settings into cm-10.2

Conflicts:
	src/com/android/settings/cyanogenmod/NavRing.java

Change-Id: I80c32362af23d11b84144a9fa3cfb70d24cafed5