Fixbug
Merge branch 'notification'

Conflicts:
	manifest.json
Release Version 1.02