Re-do the Spanish translation for HALO
Re-organize Settings/System
Merge branch 'cm-10.1' of https://github.com/CryosProject/android_packages_apps_Settings into cm-10.1
Translate 'grey halo icon switch'