DevYah/coolsoft-13 — pull request #122 by hishamelgezeery (2013-04-07 08:21:30+00:00)
Title: Fixed the relations in master

Some relationships overwritted others, so they had to be redefined. #120