Added server side for notifications approval
Merge remote-tracking branch 'origin/master'