[다혜] notification
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/app/component/tutorialModal/component.js
	res/app/component/tutorialModal/template.html
	res/app/index.html