Merge branch 'main' into feat/provider_portal

# Conflicts:
#	src/app.rs

src/common/mod.rs

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