DevYah/smartsoft-14 — pull request #321 by tonyfoti (2014-05-14 03:56:13+00:00)
Title: T2 tonyfoti 2.11

Issue #158
@sedramina @FatmaEmran @helali1993 @mohamed-halawa Please review.