disco disco
disco disco 2
Create "DISCO Extras" category (and menu)

* create disco extras category
* create disco tweaks menu (in disco extras category)
* move supersu menu to disco extras category
* move all extra features to disco tweaks menu

Signed-off-by: Yashar Ahmedizadeh <yashade2001@gmail.com>
fixes
New DISCO Tweaks Drawable By Alex Cruz

All credits to Alex Cruz / @Mazda--
String edit
Settings: add "Show weather" toggle for status bar

Signed-off-by: Roman Birg <roman@cyngn.com>
string edit 2
string edits 3
fix battery % option
Merge https://github.com/ProjectDISCO/android_packages_apps_Settings into lollipop

Conflicts:
	res/xml/disco_extras.xml