Started academic year cleanup
Finished academic year cleanup
Further cleanup
Admin academic year fixes
Config cleanup
Config cleanup
Hide shifts in overlapping academic year periods
Some small fixes
Merge branch 'refs/heads/dev-academicyear'