MGhanem/smartsoft-13 — pull request #377 by nohahesham (2013-04-21 08:00:43+00:00)
Title: C3 nohahesham master conflicts

master conflicts fixed
@m0hamed