BeshoSmile/Terasoft_14 — pull request #16 by ahmedsamouka (2014-03-02 15:09:31+00:00)
Title: resolve conflict

@YoussefSaleh