Don't render belogns_to association if there is no object
Merge branch 'master' into menu