MGhanem/smartsoft-13 — pull request #492 by SalmaFG (2013-05-03 13:27:52+00:00)
Title: [Fixing] Fixed conflicts

@AmrARaouf