CLC-3224-myfinaid-display-academic-year

https://jira.ets.berkeley.edu/jira/browse/CLC-3224

Included Aid year (eg "2013-14" or "2014-15") in the collapsed section of Financial Aid entries of the activity feed.

Also added recent MyFinaid dummy data for Oski Bear which includes two years of aidYear feeds along with the pending duplicate entry situation referenced in CLC-3307.
Merge pull request #2156 from chikoon/CLC-3224-myfinaid-display-academic-year

CLC-3224-myfinaid-display-academic-year