Merge pull request #1 from johnnyslt/kitkat2

Revert "Settings: fix shortcut icon pack usage"
Revert "Move Quick Ribbons and remove Link options"

This reverts commit b49cc18ff8fedda95e0195cf1c5d6da7ab7d6d9f.
Revert "Fix ribbon strings and ribbon tile preference"

This reverts commit cfabeb083ede33569942af91344db0827a3d5de7.

Conflicts:
	res/values/liquid_strings.xml
Revert "Move ls wallpaper and fix qs ribbons"

This reverts commit f338db90713eaf0eef0ea63fda68e6a3150e916a.
Revert "Settings: Quick Access Ribbon (Part 2 of 2)"

This reverts commit c301d233145bad1f10529d32ce9c9e3618d4fb64.
fix derp