implementation of the notification service
Merge origin/master
SettingService Implementation