Consistent use of belongs_to in migration
Merge branch 'consistent-use-of-belongs-to'