[Issue #193] Fixed tests
Merge branch 'master' of github.com:MGhanem/smartsoft-13 into C4_m0hamed_C5F2_switch_locales
[issue #95]
[MC]
changes
changes
[issue #95]
[issue #95]
extra
[MC][issue #178] merge conflicts
Merge pull request #480 from MGhanem/Omar_C2S3_mod

[MC][issue #178] merge conflicts
Merge pull request #421 from MGhanem/C4_m0hamed_C5F2_switch_locales

C4 m0hamed c5 f2 switch locales
Merge pull request #481 from MGhanem/C3_nohahesham_S05_ChooseSubscriptionModel

extra
[issue #95]
[MC]
adding umls [issue #95]
[MC]
Merge pull request #428 from MGhanem/C3_nohahesham_FeatureF1

C3 nohahesham feature f1
[#198][#199][MC] resolved conflicts