DevYah/smartsoft-14 — pull request #341 by FatmaEmran (2014-05-16 19:43:13+00:00)
Title: T2 Fatma Emran 2.14

#330 @sedramina @helali1993 @tonyfoti @mohamed-halawa please review