Fix Lockscreen Interface Layout/Fix Navigation Category Strings (Derps)
Merge branch 'jb2' of git://github.com/LiquidSmooth/android_packages_apps_Settings into jb2

Conflicts:
	res/xml/lockscreen_interface_settings.xml