Im the man
CRT screen on/off animations user defined (2/2)

Conflicts:
	res/values/strings.xml
	res/xml/interface_settings.xml
	src/com/android/settings/carbon/InterfaceSettings.java
We need these.
Introducing Xposed Framework... (2/2)
Add an About CarbonRom section
We need this also.
Merge branch 'jb2' of github.com:CarbonDev/android_packages_apps_Settings into jb2-PIE

Conflicts:
	res/values/strings.xml
	src/com/android/settings/carbon/InterfaceSettings.java