MGhanem/smartsoft-13 — pull request #480 by Omar-Hossam (2013-05-02 21:12:24+00:00)
Title: [MC][issue #178] merge conflicts

issue #178
@karimngr please review