add notification system
Merge branch 'master' into rewrite-javascript