more updates
Merge branch 'cm-10.1' of https://github.com/pulser/android_packages_apps_Settings into cm-10.1