big pie update
Merge branch 'cm-10.1' of https://github.com/Mysteriouspacman/android_packages_apps_Settings.git into cm-10.1