Settings UI Profile
Merge branch 'cm-12.0' of https://github.com/A2D-MY/android_packages_apps_Settings into cm-12.0

Conflicts:
	res/values/cm_strings.xml