DevYah/smartsoft-14 — pull request #305 by aaeabdo (2014-05-13 00:44:26+00:00)
Title: Story 4.1 Story 4.2

issue #155 #257
@karim-elbawab @osherifo @MennatallahElKharbotly @omartarek please review