Remove all conflicting features with PA hybrid addition

Change-Id: I3d0566c36688c30c9a75f6db9517b65ce68fa2dd

Conflicts:

	res/xml/prefs_navbar.xml
	res/xml/prefs_ui.xml
	src/com/aokp/romcontrol/fragments/Navbar.java
	src/com/aokp/romcontrol/fragments/UserInterface.java