Merge https://github.com/Mahdi-Rom/android_device_samsung_jflte into kk-4.4

Conflicts:
	overlay/packages/apps/MahdiCenter/res/values/strings.xml