Add possibility to use statusbar icon color as network speed indicator color [2/2]

(cherry picked from commit 5c775ed295402386383ed27e7db415de20fcee05)

Conflicts:
	res/values/pa_strings.xml
	res/xml/status_bar_traffic_style.xml
	src/com/android/settings/cyanogenmod/StatusBarTrafficStyle.java
Add option to turn off CRT effect [2/2]

(cherry picked from commit 7fa5fc369d53a2c3fa2074c3f9bdcbf97b371576)

Conflicts:
	res/values/pa_strings.xml
	src/com/android/settings/DisplaySettings.java