FIX Y U GET DELETED!?!?!?!

Conflicts:
	res/xml/prefs_navbar.xml
	src/com/android/settings/aokp/Navbar.java
	src/com/android/settings/aokp/ROMControlActivity.java