DevYah/smartsoft-14 — pull request #134 by eldesouky (2014-03-28 14:35:56+00:00)
Title: resolving the conflictand proplems with order class

Issue #88 @jihan2032 @ZzimBoo91 @omartarek @attwa @lotfy1893