#362 add default body messages
#362 fix branch
#362 fix notifications bug
#362 fix conflicts
#362 fix conflicts
#362 add notification sounds
Merge pull request #512 from ndomar/c5_MohamedShaban_#45_integrate_notifications

S[45]: Notification System integration