Navring settings

Squashed commit of the following:

commit b2a4caff31e0eb3d47aca3135624ff3e139aa99f
Author: PrimeDirective <activethrasher00@gmail.com>
Date:   Fri Dec 7 23:47:13 2012 -0500

    navring fixes

    Change-Id: I6cb564360806d6f4ad4a3231fe0fb1a87826fa0b

commit 67da4a0c7f0a9e73a0546e7ff43e26fdb2f46e73
Author: PrimeDirective <activethrasher00@gmail.com>
Date:   Thu Dec 6 19:11:28 2012 -0500

    navring initial

    Change-Id: Ide1e1a88c0354f00fe8a388194f919c00fc782fa

    Conflicts:

    	res/values/strings.xml

Change-Id: I1d96d24e6912fbec99e888bf06868685c7858221

Conflicts:

	res/values/strings.xml
	res/xml/display_settings.xml