Merge branch 'master' of https://github.com/MGhanem/smartsoft-13 into C3_nohahesham_S05_ChooseSubscriptionModel
commiting merge conflicts
[MC]
[Isue #186][MC] fixed merge conflict
mc
[Issue #186][Done] added UML