Notification ShortCuts (2/2)

Conflicts:
	AndroidManifest.xml
	res/values/bk_arrays.xml
	res/values/bk_strings.xml