separate class for App.Notifier
Merge branch 'master' into beta