** Finished academic terms setup wizard view
Merge branch 'FTR-108_setup_wizard' into develop