Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Settings into jb-mv

Conflicts:
	src/com/android/settings/cyanogenmod/StatusBar.java

Change-Id: Ifa1410fea5e8e6d0be2385d7d187be732813b9f0