ListView Animations (1/2)

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
Fixed Conflicts
Fixed Conflicts
Added ColorPickerPreference.java
Fixed DisplaySettings.java
Merge branch 'cm-10.2' of github.com:torrented/android_packages_apps_Settings into cm-10.2
More ColorPicker Stuff
Add dialog_color_picker.xml
Added ColorPicker Strings
added some .png's
Update RamBar.java
Update RamBar.java
Merge branch 'cm-10.2' of https://github.com/CyanFox/android_packages_apps_Settings into cm-10.2
Update Strings
Fixed Display FC
Merge pull request #7 from torrented/cm-10.2

Merge Request #1