Merge branch 'main' into feature/scholarship-edit-form

# Conflicts:
#	src/app.rs
#	src/common/mod.rs
#	src/pages/api/scholarships.rs
#	src/pages/comparison_test.rs
#	src/pages/home_page.rs
#	src/pages/mod.rs
#	src/pages/scholarship_info.rs

src/common/mod.rs

@@ -1,9 +1,9 @@
 mod comparison;
 mod expandable_info;
+mod form_params;
 mod form_schema;
 mod user;
 mod value_type;
-mod form_params;
 mod submit_status;
 
 pub use self::{comparison::*, expandable_info::*, form_schema::*, user::*, value_type::*, form_params::*, submit_status::*};