Declared association in stat_line model class
Merge branch 'aric'