#16 build associated fields moved to controller [t: 0:26]
Merge remote-tracking branch 'origin/master'