Merge branch 'task_388' of github.com:raniaashraf/mozzn into task_388
Merge pull request #1 from raniaashraf/task_388

Task 388
Merge branch 'task_388' of github.com:raniaashraf/mozzn into task_388
task_389
Merge remote-tracking branch 'upstream/master' into task_389
manual merge