增加notificationActivity的相关内容
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/values/colors.xml