Bring back PA Hybrid settings!

Revert "Revert "Merge branch 'HYBRID' of git://github.com/CarbonDev/android_packages_apps_Settings into jb2""

This reverts commit bd216e215444140f2a6a4c7615832146274cfdd8.

Conflicts:
	res/drawable-hdpi/ic_carbon_performance.png
	res/drawable-hdpi/ic_carbon_trds.png
	res/drawable-xhdpi/ic_carbon_performance.png
	res/drawable-xhdpi/ic_carbon_trds.png
	src/com/android/settings/carbon/RibbonTargets.java