notification updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	yuYAPP-html/js/getNotification.js