Pull Request: C1 mamdouh 516 notifications 2.10 2.11

@KhaledHelmy @MohabGhanim @AmirGeorge @Serag8 
The tests are not complete yet and I still need to co-ordinate with Atef on this so do not review now