Delete expanded desktop
fix navbar

Conflicts:
	res/values/cr_strings.xml
fixes
try to fix CRSettings.java
Fix batterybar
Next fixes
Merge branch 'kitkat' of https://github.com/CrystalAOKP/packages_apps_Settings into kitkat