Merge branch 'master' into coltons-branch
Set default 'affiliate_id' to 0
Added 'prepop.js' and associated JS code after the StatTrack object is instantiated
Merge branch 'coltons-branch'