Revert "Build straight with crDroid info in "About phone" (3/3)"

This reverts commit a03b8797a285f66a2d96c6b82205d322c44916ae.
Revert "crDroid version in settings"

This reverts commit 93a6b030140fe233881a52040c7bb9dcde8e84c1.

Conflicts:
	res/values/cr_strings.xml
	res/xml/device_info_settings.xml
Revert "Return: Listanimation views and interpolator [2/2]"

This reverts commit ec99a441b85322655bdd591861672bd68fb7232d.
Revert "Launch Heads Up in floating window [2/2]"

This reverts commit 553400c6cb2db606674a9c7d21fd4ca6f81d180a.

Conflicts:
	res/values/cr_strings.xml
	res/xml/heads_up_settings.xml
Revert "HOVER: touch to hide (2/2)"

This reverts commit c546630c55e945a73d8330cc52b59afb30680f40.

Conflicts:
	res/values/cr_arrays.xml
Revert "Hover: exclude from insecure lockscreen (2/2)"

This reverts commit 393e0761339d2f88c2f25185b887d5d7c8b577a7.

Conflicts:
	res/values/cr_strings.xml
Revert "HOVER: Option to exclude topmost app [1/2]"

This reverts commit 32000722b2043cc61d22d4ac25719e4d20472b1b.

Conflicts:
	res/values/cr_strings.xml
Revert "Hover notification timeout (2/2)"

This reverts commit 58ad0b52a7a92d81f537afa504c7bd7397c6986a.

Conflicts:
	res/values/cr_arrays.xml
	res/values/cr_strings.xml
Revert "Hover settings (2/2)"

This reverts commit cd7fc684b8659520cffc740a44f2b385888bab4c.

Conflicts:
	res/values/cr_strings.xml
	res/xml/settings_headers.xml
Revert "Halo master switch (2/2)"

This reverts commit cd66e19cd94858b7161cff0029e5701e06fcddcc.
Revert "HOVER [2/2]"

This reverts commit bfe500325d2785e446e0d561ba52963225d1d936.

Conflicts:
	src/com/android/settings/applications/InstalledAppDetails.java
Revert "Apps: Add blacklist interface [2/2]"

This reverts commit 24467d6fa07a408a8db73595d9cfd0d53b3fa93c.

Conflicts:
	res/values/cr_strings.xml
	src/com/android/settings/applications/InstalledAppDetails.java
Revert "[2/2] Add support for Peek app"

This reverts commit 6a4ab5b7b92f072cec50f665d95a61fae0361921.
Revert "GestureAnywhere: make sure ga_gestures is world readable."

This reverts commit 5f41026c8dca8b360cb10b3710da7fcb99724222.
Revert "Gesture Anywhere: Add gesture anywhere feature into the ChaOS Lab [2/2]"

This reverts commit 560004594a91ad66cc36e0835d961a014fbaa884.

Conflicts:
	res/values/cr_arrays.xml
	res/values/cr_strings.xml
	res/xml/system_ui_settings.xml
Revert "Peek wake timeout (2/2)"

This reverts commit a5721f3cbc0a90521bc135e0e8a4542ce175205d.

Conflicts:
	res/values/cr_arrays.xml
Revert "PEEK pick up timeout: ensure stock value on clean install and also show summary of it (2/2)"

This reverts commit ffae5a39a24bd8ad838ddf5f2cd314dcc3e5428d.
Revert "PEEK: configurable pickup timeout (1/2)"

This reverts commit e8164a818e5073de6fc8d7fbbbbbf8bc93cc0fe4.

Conflicts:
	res/values/cr_arrays.xml
Revert "PEEK (2/2)"

This reverts commit 742224f96ed9e808fef453b70bea72bce99a2e86.

Conflicts:
	res/xml/lockscreen_notifications.xml
Revert "App sidebar (2/2)"

This reverts commit 15916ad95dc4e2c40c3f9a13392c57eaf3ba0320.

Conflicts:
	res/values/cr_arrays.xml
	res/values/cr_strings.xml