Merge pull request #1 from TeamCanjica/master

Merge with TC
Merge branch 'master' of github.com:jereksel/android_packages_apps_DeviceSettings
Do we really have to translate that?