add in icons from BlakCM + other shit
Merge branch 'master' of https://github.com/Blak-KANG/android_packages_apps_Settings

Conflicts:
	res/drawable-hdpi/ic_action_settings.png
	res/drawable-xhdpi/ic_action_settings.png
	res/values/blak_strings.xml