updated language files to prep for new phrasing, refs #569
changed 'matriculation' to 'academic', style change
Merge branch 'master' of github.com:thecoolestguy/ilios into feat569
fixed merge conflict after pull from upstream
fixed one small problem with last merge fix
Merge branch 'master' of github.com:ilios/ilios into feat569
graduating class of string now being returned from function, initializing at program year creation
removed some console output from debugging
graduation year now triggering on programYear selection change, additional years still need work
Matriculation year summary info, now initializing correctly on program year container creation and programyear select onselect
FINALLY got the matriculation summary text working, now initializes with correct value regardless of which container you are in
Merge branch 'master' of github.com:ilios/ilios into feat569
academic year selector now updates matriculation text adjacent to selector AND in collapse div summary, refs #569
bugfix: removed calls to deleted getCSSRule() method. moved CSS rules into stylesheet.
Merge pull request #163 from ucsflibtopfstedt/master

bugfix: removed calls to deleted getCSSRule() method. moved CSS rules in...
moved getGraduatingClassOfString function into more appropriate file, updated method name to something more appropriate, fixed typo, changed some comments
Merge pull request #162 from thecoolestguy/feat569

Feat569
Merge branch 'master' into curriculum_inventory_export

Conflicts:
	web/application/language/ilios_strings_en_US.properties
	web/application/views/program/program_manager_dom.js