Correct halves rendering of semesters
Merge remote-tracking branch 'upstream/master' into 4-year-plans
Update 4y plan data
Merge branch '4-year-plans' into 4.0_template