Cleanup
Use the new PreferenceDrawerActivity by 0xD34D
Revert "Revert "RC: Ribbon v1.0 overhaul""

This reverts commit 14ef84e3e30dbfc45b0ca9893495c02f984016a2.
Merge remote-tracking branch 'upstream/jellybean' into jellybean