Index: 3rdParty_sources/3rdParty_sources.iml
===================================================================
diff -u -raed5504b91b56d777f9ebbbb9bd620ed95bab5e6 -r0830e8691458c7833c2aa84cfd18806b34daeaa8
--- 3rdParty_sources/3rdParty_sources.iml	(.../3rdParty_sources.iml)	(revision aed5504b91b56d777f9ebbbb9bd620ed95bab5e6)
+++ 3rdParty_sources/3rdParty_sources.iml	(.../3rdParty_sources.iml)	(revision 0830e8691458c7833c2aa84cfd18806b34daeaa8)
@@ -40,6 +40,8 @@
       <excludeFolder url="file://$MODULE_DIR$/websocket" />
       <excludeFolder url="file://$MODULE_DIR$/xmltooling" />
       <excludeFolder url="file://$MODULE_DIR$/xstream" />
+      <excludeFolder url="file://$MODULE_DIR$/reactive-streams" />
+      <excludeFolder url="file://$MODULE_DIR$/reactor" />
     </content>
     <orderEntry type="jdk" jdkName="11" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
Index: idea_project/.idea/libraries/3rdParty.xml
===================================================================
diff -u -rf5d27dea6e5752fec029c67db67a5b7df49e10e8 -r0830e8691458c7833c2aa84cfd18806b34daeaa8
--- idea_project/.idea/libraries/3rdParty.xml	(.../3rdParty.xml)	(revision f5d27dea6e5752fec029c67db67a5b7df49e10e8)
+++ idea_project/.idea/libraries/3rdParty.xml	(.../3rdParty.xml)	(revision 0830e8691458c7833c2aa84cfd18806b34daeaa8)
@@ -9,50 +9,52 @@
       <root url="jar://$PROJECT_DIR$/../lams_build/lib/apache-poi/xmlbeans-5.1.1.jar!/" />
       <root url="jar://$PROJECT_DIR$/../lams_build/lib/apache-poi/commons-compress-1.23.0.jar!/" />
       <root url="jar://$PROJECT_DIR$/../lams_build/lib/apache-poi/poi-ooxml-full-5.2.3.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/autopatch/autopatch-1.4.2-lams.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/autopatch/discovery-1.0.5-lams.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/basiclti-util/basiclti-util-1.2.0.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/basiclti-util/oauth-20100527.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/basiclti-util/oauth-provider-20100527.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/basiclti-util/signpost-commonshttp4-1.2.1.2.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/basiclti-util/signpost-core-1.2.1.2.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/googleauth/googleauth-1.1.1.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/fckeditor/fckeditor-java-core-2.6.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/json/json-simple-1.1.1.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/quartz/quartz-2.2.3.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/jakarta-commons/commons-validator-1.6.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/jakarta-commons/commons-fileupload-1.3.3.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/jlatexmath/jlatexmath-1.0.8.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/json/json-simple-1.1.1.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/mysql/mysql-connector-java-8.0.11.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/quartz/quartz-2.2.3.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/reactor/reactor-core-3.4.12.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/spring/spring-aop-5.3.18.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/spring/spring-beans-5.3.18.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/spring/spring-context-5.3.18.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/spring/spring-context-support-5.3.18.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/spring/spring-core-5.3.18.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/spring/spring-expression-5.3.18.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/spring/spring-jdbc-5.3.18.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/spring/spring-orm-5.3.18.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/spring/spring-tx-5.3.18.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/spring/spring-web-5.3.18.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/spring/spring-webmvc-5.3.18.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/xstream/xstream-1.4.11.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/clamav/clamav-client-2.0.2.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/batik/batik-dom.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/batik/batik-svggen.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/batik/batik-awt-util.jar!/"/>
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/autopatch/autopatch-1.4.2-lams.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/autopatch/discovery-1.0.5-lams.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/basiclti-util/basiclti-util-1.2.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/basiclti-util/oauth-20100527.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/basiclti-util/oauth-provider-20100527.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/basiclti-util/signpost-commonshttp4-1.2.1.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/basiclti-util/signpost-core-1.2.1.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/googleauth/googleauth-1.1.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/fckeditor/fckeditor-java-core-2.6.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/json/json-simple-1.1.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/quartz/quartz-2.2.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/jakarta-commons/commons-validator-1.6.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/jakarta-commons/commons-fileupload-1.3.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/jlatexmath/jlatexmath-1.0.8.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/json/json-simple-1.1.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/mysql/mysql-connector-java-8.0.11.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/quartz/quartz-2.2.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/reactor/reactor-core-3.4.12.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/spring/spring-aop-5.3.18.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/spring/spring-beans-5.3.18.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/spring/spring-context-5.3.18.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/spring/spring-context-support-5.3.18.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/spring/spring-core-5.3.18.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/spring/spring-expression-5.3.18.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/spring/spring-jdbc-5.3.18.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/spring/spring-orm-5.3.18.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/spring/spring-tx-5.3.18.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/spring/spring-web-5.3.18.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/spring/spring-webmvc-5.3.18.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/xstream/xstream-1.4.11.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/clamav/clamav-client-2.0.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/batik/batik-dom.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/batik/batik-svggen.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/batik/batik-awt-util.jar!/" />
       <root url="jar://$PROJECT_DIR$/../lams_build/lib/batik/batik-util.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/etherpad/etherpad_lite_client-1.2.13.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/passpol/passpol-0.7.1-SNAPSHOT.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/json/jjwt-api-0.11.2.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/json/jjwt-impl-0.11.2.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/json/jjwt-jackson-0.11.2.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/reactivestreams/reactive-streams-1.0.3.jar!/"/>
-      <root url="jar://$PROJECT_DIR$/../lams_build/lib/csrfguard/csrfguard-4.1.3-custom-2022.04.03.jar!/"/>
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/etherpad/etherpad_lite_client-1.2.13.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/passpol/passpol-0.7.1-SNAPSHOT.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/json/jjwt-api-0.11.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/json/jjwt-impl-0.11.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/json/jjwt-jackson-0.11.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/reactivestreams/reactive-streams-1.0.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../lams_build/lib/csrfguard/csrfguard-4.1.3-custom-2022.04.03.jar!/" />
     </CLASSES>
     <JAVADOC />
-    <SOURCES />
+    <SOURCES>
+      <root url="file://$3RDPARTY_SOURCES_PROJECT_47$/spring" />
+    </SOURCES>
   </library>
 </component>
\ No newline at end of file
Index: lams_common/db/sql/insert_lams_users.sql
===================================================================
diff -u -r812d599154aefa64ac8c3db4cdecdc1b679706af -r0830e8691458c7833c2aa84cfd18806b34daeaa8
--- lams_common/db/sql/insert_lams_users.sql	(.../insert_lams_users.sql)	(revision 812d599154aefa64ac8c3db4cdecdc1b679706af)
+++ lams_common/db/sql/insert_lams_users.sql	(.../insert_lams_users.sql)	(revision 0830e8691458c7833c2aa84cfd18806b34daeaa8)
@@ -102,7 +102,6 @@
 (42,20,3),
 (43,21,3),
 (44,22,3),
-(45,16,4),
 (47,18,4),
 (48,19,4),
 (49,20,4),