#69-Manage Notification Modification notification
Merge branch 'ha/69/Manage_Notification' into dev