alaashafaee/Coolsoft-14 — pull request #219 by Husseny (2014-04-14 14:02:55+00:00)
Title: Issue #201 resolve conflict

reviewers:
@fadel1493 @Sharaf93 @rami-khalil @mimikian @mohamedsaeed93