Add option to turn off CRT effect [2/2]

Conflicts:
	res/values/pa_strings.xml
	src/com/android/settings/DisplaySettings.java
AOKP custom system animations (2/2)

ported fom here: http://gerrit.aokp.co/#/c/12305/

Thanks to Steve Spear

Change-Id: Ic93fc795c4600784a423f2e9b5b1984c7aabb7cb

Conflicts:

	AndroidManifest.xml
	res/values/cm_strings.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/SettingsPreferenceFragment.java

Conflicts:
	AndroidManifest.xml
	res/values/cm_strings.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/SettingsPreferenceFragment.java

Conflicts:
	AndroidManifest.xml
	res/values/pa_strings.xml
	src/com/android/settings/SettingsPreferenceFragment.java
Some fixes

	modified:   res/values/pa_arrays.xml
	modified:   res/xml/perf_profile_settings.xml
	modified:   res/xml/tool_bar_settings.xml
	modified:   src/com/android/settings/SettingsPreferenceFragment.java

Conflicts:
	res/values/pa_arrays.xml
	res/xml/perf_profile_settings.xml
	res/xml/tool_bar_settings.xml
some alignment fixes to custom animation
changes to CRT off feature
Add option to turn off CRT effect - some changes
some fixes
come fixes for AOKP animation
changes to AOKP animations
Derp
more changes
derp
derp1
remove Rambar setting
Merge remote-tracking branch 'upstream/jb43-legacy' into exp

Conflicts:
	res/values/pa_strings.xml
Merge branch 'exp' of https://github.com/tilaksidduram/android_packages_apps_Settings into exp

Conflicts:
	res/values/pa_strings.xml
Merge remote-tracking branch 'settings/exp' into jb43-legacy
Settings: Allow different maximum vales for each gamma control

Change-Id: If79a0d988d09ec15e05bc08b5cac7015d793dabc
Merge remote-tracking branch 'upstream/jb43-legacy' into jb43-legacy