Fix belongs_to relation, still needs spec
Merge branch 'master' into ea