Merge branch 'release-1.2.5'

Author: mbelmadani

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>ubc.pavlab</groupId>
     <artifactId>rdp</artifactId>
-    <version>1.2.4</version>
+    <version>1.2.5</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -22,6 +22,12 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>groovy</artifactId>
+                    <groupId>org.codehaus.groovy</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

src/main/resources/templates/user/documentation.html

@@ -173,21 +173,22 @@ <h5 class="mb-0">
                                     <h5 class="mb-0">
                                         <button class="btn btn-link" data-toggle="collapse" data-target="#modelmanager"
                                                 aria-expanded="false" aria-controls="modelmanager">
-                                            Model Organism Manager
+                                            Model Organism Tab
                                         </button>
                                     </h5>
                                 </div>
 
                                 <div id="modelmanager" class="collapse" aria-labelledby="modelmanager-heading"
                                      data-parent="#model-accordion">
                                     <div class="card-body">
-                                        <p>
-                                            In the manager, you can optionally enter a description of
-                                            your research on this organism (Organism Research Focus), if you feel it is
-                                            different from the description you may have provided in your <b><a th:href="@{/user/profile}">Profile</a></b> (About My Research).
-                                        </p>
-
-                                        <p>The most important functionality of the Manager is
+                                      <p>
+					After selecting a model organism in the drop-down menu, you can optionally enter
+					a description of your research on this organism (Organism Research Focus), if you
+					feel it is different from the description you may have provided in your
+					<b><a th:href="@{/user/profile}">Profile</a></b> (About My Research).
+                                      </p>
+
+                                        <p>The most important functionality of this section is
                                             the addition of genes, and then of Gene Ontology terms.</p>
                                     </div>
                                 </div>
@@ -412,4 +413,4 @@ <h5 class="mb-0">
 </div>
 <div th:replace="fragments/footer" th:remove="tag">...</div>
 </body>
-</html>
+</html>