diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java
index 7c092f2dc99544124568e49e2d27ec205cb27131..c5bcc092ed699e2ab8ca7f93fcafd946dd58fb26 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java
@@ -183,7 +183,7 @@ public class ManagementImpl implements Management {
String adminPassword = vereinfachtesResultSet.getString("adminpassword");
String token = vereinfachtesResultSet.getString("token");
String phase = vereinfachtesResultSet.getString("phase");
- Project project = new Project(id, password, active, timestamp, author, adminPassword, token);
+ Project project = new Project(id, password, active, timestamp, author, adminPassword, token, ProjectPhase.valueOf(phase));
ProjectPhase projectPhase = ProjectPhase.valueOf(phase);
project.setPhase(projectPhase);
return project;
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/omniDependencies.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/omniDependencies.java
index ac6ce6fcd31cfc5ae79f42c26bc644404077970d..a3042c94ec08f3e35425638baa1980c3ff755415 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/omniDependencies.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/omniDependencies.java
@@ -11,16 +11,16 @@ public class omniDependencies extends SimpleTagSupport {
" <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\n" +
" <title>fltrail</title>\n" +
" <link rel=\"stylesheet\" href=\"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css\">\n" +
- " <link rel=\"stylesheet\" href=\"../assets/css/styles.css\">\n" +
- " <link rel=\"stylesheet\" href=\"../assets/css/footer.css\">\n" +
+ " <link rel=\"stylesheet\" href=\"../libs/css/styles.css\">\n" +
+ " <link rel=\"stylesheet\" href=\"../libs/css/footer.css\">\n" +
" <script src=\"https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js\"></script>\n" +
" <script src=\"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js\"></script>\n" +
- " <link rel=\"stylesheet\" href=\"../assets/fonts/font-awesome.min.css\">\n" +
- " <link rel=\"stylesheet\" href=\"../assets/css/Sidebar-Menu-1.css\">\n" +
- " <link rel=\"stylesheet\" href=\"../assets/css/Sidebar-Menu.css\">\n" +
- " <script src=\"../assets/js/Sidebar-Menu.js\"></script>\n" +
- " <script src=\"../assets/js/utility.js\"></script>\n" +
- " <script src=\"../assets/js/footer.js\"></script>\n" +
+ " <link rel=\"stylesheet\" href=\"../libs/fonts/font-awesome.min.css\">\n" +
+ " <link rel=\"stylesheet\" href=\"../libs/css/Sidebar-Menu-1.css\">\n" +
+ " <link rel=\"stylesheet\" href=\"../libs/css/Sidebar-Menu.css\">\n" +
+ " <script src=\"../libs/js/Sidebar-Menu.js\"></script>\n" +
+ " <script src=\"../libs/js/utility.js\"></script>\n" +
+ " <script src=\"../libs/js/footer.js\"></script>\n" +
" <link rel=\"stylesheet\" href=\"https://use.fontawesome.com/releases/v5.1.0/css/all.css\"\n" +
" integrity=\"sha384-lKuwvrZot6UHsBSfcMvOkWwlCMgc0TaWr+30HWe3a4ltaBwTZhyTEggF5tJv8tbt\" crossorigin=\"anonymous\">");
}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/Project.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/Project.java
index 62a7775d984bffd9a5dde30356721feb61793ef7..6ca31795c7dd6b06f1d9a40ff1a8d9d66e2f32a9 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/Project.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/Project.java
@@ -18,7 +18,6 @@ public class Project {
private String author;
private String adminPassword;
private String token;
- // TODO: using enum ProjectPhase
private ProjectPhase phase;
public Project() {
@@ -35,20 +34,9 @@ public class Project {
this.setPhase(ProjectPhase.CourseCreation);
}
- public ProjectPhase getPhase() {
- this.phase = phase;
- this.id = id;
- this.password = password;
- this.active = active;
- this.author = author;
- this.adminPassword = adminPassword;
- this.token = token;
- this.phase = projectPhase.name();
-
- this.timecreated = Timestamp.valueOf(LocalDateTime.now(ZoneId.of("UTC")));
- }
-
- public Project(String id, String password, Boolean active, Timestamp timecreated, String author, String adminPassword, String token, String phase) {
+ public Project(String id, String password, Boolean active,
+ Timestamp timecreated, String author, String adminPassword,
+ String token, ProjectPhase phase) {
this.id = id;
this.password = password;
this.active = active;
@@ -111,7 +99,7 @@ public class Project {
return timecreated;
}
- public String getPhase() {
+ public ProjectPhase getPhase() {
return phase;
}
@@ -121,7 +109,7 @@ public class Project {
* @param phase
*/
public void setPhase(ProjectPhase phase) {
- this.phase = phase.name();
+ this.phase = phase;
}
@Override
diff --git a/gemeinsamforschen/src/main/webapp/assets/bootstrap/css/bootstrap.min.css b/gemeinsamforschen/src/main/webapp/libs/bootstrap/css/bootstrap.min.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/bootstrap/css/bootstrap.min.css
rename to gemeinsamforschen/src/main/webapp/libs/bootstrap/css/bootstrap.min.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/bootstrap/js/bootstrap.min.js b/gemeinsamforschen/src/main/webapp/libs/bootstrap/js/bootstrap.min.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/bootstrap/js/bootstrap.min.js
rename to gemeinsamforschen/src/main/webapp/libs/bootstrap/js/bootstrap.min.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/Community-ChatComments.css b/gemeinsamforschen/src/main/webapp/libs/css/Community-ChatComments.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/css/Community-ChatComments.css
rename to gemeinsamforschen/src/main/webapp/libs/css/Community-ChatComments.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/Contact-Form-Clean.css b/gemeinsamforschen/src/main/webapp/libs/css/Contact-Form-Clean.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/css/Contact-Form-Clean.css
rename to gemeinsamforschen/src/main/webapp/libs/css/Contact-Form-Clean.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/Customizable-Carousel-swipe-enabled.css b/gemeinsamforschen/src/main/webapp/libs/css/Customizable-Carousel-swipe-enabled.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/css/Customizable-Carousel-swipe-enabled.css
rename to gemeinsamforschen/src/main/webapp/libs/css/Customizable-Carousel-swipe-enabled.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/Login-Form-Clean.css b/gemeinsamforschen/src/main/webapp/libs/css/Login-Form-Clean.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/css/Login-Form-Clean.css
rename to gemeinsamforschen/src/main/webapp/libs/css/Login-Form-Clean.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/MUSA_panel-table.css b/gemeinsamforschen/src/main/webapp/libs/css/MUSA_panel-table.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/css/MUSA_panel-table.css
rename to gemeinsamforschen/src/main/webapp/libs/css/MUSA_panel-table.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/MUSA_panel-table1.css b/gemeinsamforschen/src/main/webapp/libs/css/MUSA_panel-table1.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/css/MUSA_panel-table1.css
rename to gemeinsamforschen/src/main/webapp/libs/css/MUSA_panel-table1.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/Navigation-with-Button1.css b/gemeinsamforschen/src/main/webapp/libs/css/Navigation-with-Button1.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/css/Navigation-with-Button1.css
rename to gemeinsamforschen/src/main/webapp/libs/css/Navigation-with-Button1.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/Sidebar-Menu-1.css b/gemeinsamforschen/src/main/webapp/libs/css/Sidebar-Menu-1.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/css/Sidebar-Menu-1.css
rename to gemeinsamforschen/src/main/webapp/libs/css/Sidebar-Menu-1.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/Sidebar-Menu.css b/gemeinsamforschen/src/main/webapp/libs/css/Sidebar-Menu.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/css/Sidebar-Menu.css
rename to gemeinsamforschen/src/main/webapp/libs/css/Sidebar-Menu.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/Sidebar-Menu1.css b/gemeinsamforschen/src/main/webapp/libs/css/Sidebar-Menu1.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/css/Sidebar-Menu1.css
rename to gemeinsamforschen/src/main/webapp/libs/css/Sidebar-Menu1.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/Team-Boxed.css b/gemeinsamforschen/src/main/webapp/libs/css/Team-Boxed.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/css/Team-Boxed.css
rename to gemeinsamforschen/src/main/webapp/libs/css/Team-Boxed.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/annotationStyle.css b/gemeinsamforschen/src/main/webapp/libs/css/annotationStyle.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/css/annotationStyle.css
rename to gemeinsamforschen/src/main/webapp/libs/css/annotationStyle.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/create-journal.css b/gemeinsamforschen/src/main/webapp/libs/css/create-journal.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/css/create-journal.css
rename to gemeinsamforschen/src/main/webapp/libs/css/create-journal.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/e-portfolio.css b/gemeinsamforschen/src/main/webapp/libs/css/e-portfolio.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/css/e-portfolio.css
rename to gemeinsamforschen/src/main/webapp/libs/css/e-portfolio.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/editDescription.css b/gemeinsamforschen/src/main/webapp/libs/css/editDescription.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/css/editDescription.css
rename to gemeinsamforschen/src/main/webapp/libs/css/editDescription.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/footer.css b/gemeinsamforschen/src/main/webapp/libs/css/footer.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/css/footer.css
rename to gemeinsamforschen/src/main/webapp/libs/css/footer.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/jquery.tagsinput.css b/gemeinsamforschen/src/main/webapp/libs/css/jquery.tagsinput.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/css/jquery.tagsinput.css
rename to gemeinsamforschen/src/main/webapp/libs/css/jquery.tagsinput.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/projects.css b/gemeinsamforschen/src/main/webapp/libs/css/projects.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/css/projects.css
rename to gemeinsamforschen/src/main/webapp/libs/css/projects.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css b/gemeinsamforschen/src/main/webapp/libs/css/researchReport.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/css/researchReport.css
rename to gemeinsamforschen/src/main/webapp/libs/css/researchReport.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/researchReportOverview.css b/gemeinsamforschen/src/main/webapp/libs/css/researchReportOverview.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/css/researchReportOverview.css
rename to gemeinsamforschen/src/main/webapp/libs/css/researchReportOverview.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/styles.css b/gemeinsamforschen/src/main/webapp/libs/css/styles.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/css/styles.css
rename to gemeinsamforschen/src/main/webapp/libs/css/styles.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/unstructured-annotation.css b/gemeinsamforschen/src/main/webapp/libs/css/unstructured-annotation.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/css/unstructured-annotation.css
rename to gemeinsamforschen/src/main/webapp/libs/css/unstructured-annotation.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/unstructured-upload.css b/gemeinsamforschen/src/main/webapp/libs/css/unstructured-upload.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/css/unstructured-upload.css
rename to gemeinsamforschen/src/main/webapp/libs/css/unstructured-upload.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/viewfeedback.css b/gemeinsamforschen/src/main/webapp/libs/css/viewfeedback.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/css/viewfeedback.css
rename to gemeinsamforschen/src/main/webapp/libs/css/viewfeedback.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/fonts/FontAwesome.otf b/gemeinsamforschen/src/main/webapp/libs/fonts/FontAwesome.otf
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/fonts/FontAwesome.otf
rename to gemeinsamforschen/src/main/webapp/libs/fonts/FontAwesome.otf
diff --git a/gemeinsamforschen/src/main/webapp/assets/fonts/font-awesome.min.css b/gemeinsamforschen/src/main/webapp/libs/fonts/font-awesome.min.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/fonts/font-awesome.min.css
rename to gemeinsamforschen/src/main/webapp/libs/fonts/font-awesome.min.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/fonts/fontawesome-webfont.eot b/gemeinsamforschen/src/main/webapp/libs/fonts/fontawesome-webfont.eot
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/fonts/fontawesome-webfont.eot
rename to gemeinsamforschen/src/main/webapp/libs/fonts/fontawesome-webfont.eot
diff --git a/gemeinsamforschen/src/main/webapp/assets/fonts/fontawesome-webfont.svg b/gemeinsamforschen/src/main/webapp/libs/fonts/fontawesome-webfont.svg
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/fonts/fontawesome-webfont.svg
rename to gemeinsamforschen/src/main/webapp/libs/fonts/fontawesome-webfont.svg
diff --git a/gemeinsamforschen/src/main/webapp/assets/fonts/fontawesome-webfont.ttf b/gemeinsamforschen/src/main/webapp/libs/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/fonts/fontawesome-webfont.ttf
rename to gemeinsamforschen/src/main/webapp/libs/fonts/fontawesome-webfont.ttf
diff --git a/gemeinsamforschen/src/main/webapp/assets/fonts/fontawesome-webfont.woff b/gemeinsamforschen/src/main/webapp/libs/fonts/fontawesome-webfont.woff
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/fonts/fontawesome-webfont.woff
rename to gemeinsamforschen/src/main/webapp/libs/fonts/fontawesome-webfont.woff
diff --git a/gemeinsamforschen/src/main/webapp/assets/fonts/fontawesome-webfont.woff2 b/gemeinsamforschen/src/main/webapp/libs/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/fonts/fontawesome-webfont.woff2
rename to gemeinsamforschen/src/main/webapp/libs/fonts/fontawesome-webfont.woff2
diff --git a/gemeinsamforschen/src/main/webapp/assets/fonts/ionicons.eot b/gemeinsamforschen/src/main/webapp/libs/fonts/ionicons.eot
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/fonts/ionicons.eot
rename to gemeinsamforschen/src/main/webapp/libs/fonts/ionicons.eot
diff --git a/gemeinsamforschen/src/main/webapp/assets/fonts/ionicons.min.css b/gemeinsamforschen/src/main/webapp/libs/fonts/ionicons.min.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/fonts/ionicons.min.css
rename to gemeinsamforschen/src/main/webapp/libs/fonts/ionicons.min.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/fonts/ionicons.svg b/gemeinsamforschen/src/main/webapp/libs/fonts/ionicons.svg
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/fonts/ionicons.svg
rename to gemeinsamforschen/src/main/webapp/libs/fonts/ionicons.svg
diff --git a/gemeinsamforschen/src/main/webapp/assets/fonts/ionicons.ttf b/gemeinsamforschen/src/main/webapp/libs/fonts/ionicons.ttf
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/fonts/ionicons.ttf
rename to gemeinsamforschen/src/main/webapp/libs/fonts/ionicons.ttf
diff --git a/gemeinsamforschen/src/main/webapp/assets/fonts/ionicons.woff b/gemeinsamforschen/src/main/webapp/libs/fonts/ionicons.woff
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/fonts/ionicons.woff
rename to gemeinsamforschen/src/main/webapp/libs/fonts/ionicons.woff
diff --git a/gemeinsamforschen/src/main/webapp/assets/img/1.jpg b/gemeinsamforschen/src/main/webapp/libs/img/1.jpg
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/img/1.jpg
rename to gemeinsamforschen/src/main/webapp/libs/img/1.jpg
diff --git a/gemeinsamforschen/src/main/webapp/assets/img/2.jpg b/gemeinsamforschen/src/main/webapp/libs/img/2.jpg
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/img/2.jpg
rename to gemeinsamforschen/src/main/webapp/libs/img/2.jpg
diff --git a/gemeinsamforschen/src/main/webapp/assets/img/3.jpg b/gemeinsamforschen/src/main/webapp/libs/img/3.jpg
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/img/3.jpg
rename to gemeinsamforschen/src/main/webapp/libs/img/3.jpg
diff --git a/gemeinsamforschen/src/main/webapp/assets/img/fides-logo.svg b/gemeinsamforschen/src/main/webapp/libs/img/fides-logo.svg
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/img/fides-logo.svg
rename to gemeinsamforschen/src/main/webapp/libs/img/fides-logo.svg
diff --git a/gemeinsamforschen/src/main/webapp/assets/img/noImg.png b/gemeinsamforschen/src/main/webapp/libs/img/noImg.png
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/img/noImg.png
rename to gemeinsamforschen/src/main/webapp/libs/img/noImg.png
diff --git a/gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/.gitignore b/gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/.gitignore
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/.gitignore
rename to gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/.gitignore
diff --git a/gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/Gruntfile.js b/gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/Gruntfile.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/Gruntfile.js
rename to gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/Gruntfile.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/README.md b/gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/README.md
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/README.md
rename to gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/README.md
diff --git a/gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/bower.json b/gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/bower.json
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/bower.json
rename to gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/bower.json
diff --git a/gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/dist/jquery.tagsinput.min.css b/gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/dist/jquery.tagsinput.min.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/dist/jquery.tagsinput.min.css
rename to gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/dist/jquery.tagsinput.min.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/dist/jquery.tagsinput.min.js b/gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/dist/jquery.tagsinput.min.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/dist/jquery.tagsinput.min.js
rename to gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/dist/jquery.tagsinput.min.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/example.html b/gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/example.html
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/example.html
rename to gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/example.html
diff --git a/gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/grunt-tasks/assets_production.js b/gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/grunt-tasks/assets_production.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/grunt-tasks/assets_production.js
rename to gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/grunt-tasks/assets_production.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/grunt-tasks/options/cssmin.js b/gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/grunt-tasks/options/cssmin.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/grunt-tasks/options/cssmin.js
rename to gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/grunt-tasks/options/cssmin.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/grunt-tasks/options/uglify.js b/gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/grunt-tasks/options/uglify.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/grunt-tasks/options/uglify.js
rename to gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/grunt-tasks/options/uglify.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/package.json b/gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/package.json
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/package.json
rename to gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/package.json
diff --git a/gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/src/jquery.tagsinput.css b/gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/src/jquery.tagsinput.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/src/jquery.tagsinput.css
rename to gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/src/jquery.tagsinput.css
diff --git a/gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/src/jquery.tagsinput.js b/gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/src/jquery.tagsinput.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/src/jquery.tagsinput.js
rename to gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/src/jquery.tagsinput.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/test/fake_json_endpoint.html b/gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/test/fake_json_endpoint.html
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/test/fake_json_endpoint.html
rename to gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/test/fake_json_endpoint.html
diff --git a/gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/test/fake_plaintext_endpoint.html b/gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/test/fake_plaintext_endpoint.html
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/jQuery-Tags-Input-master/test/fake_plaintext_endpoint.html
rename to gemeinsamforschen/src/main/webapp/libs/jQuery-Tags-Input-master/test/fake_plaintext_endpoint.html
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/AlertAssessmentOutlier.js b/gemeinsamforschen/src/main/webapp/libs/js/AlertAssessmentOutlier.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/AlertAssessmentOutlier.js
rename to gemeinsamforschen/src/main/webapp/libs/js/AlertAssessmentOutlier.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/Customizable-Carousel-swipe-enabled.js b/gemeinsamforschen/src/main/webapp/libs/js/Customizable-Carousel-swipe-enabled.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/Customizable-Carousel-swipe-enabled.js
rename to gemeinsamforschen/src/main/webapp/libs/js/Customizable-Carousel-swipe-enabled.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/Quiz-docent.js b/gemeinsamforschen/src/main/webapp/libs/js/Quiz-docent.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/Quiz-docent.js
rename to gemeinsamforschen/src/main/webapp/libs/js/Quiz-docent.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/Quiz.js b/gemeinsamforschen/src/main/webapp/libs/js/Quiz.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/Quiz.js
rename to gemeinsamforschen/src/main/webapp/libs/js/Quiz.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/Sidebar-Menu.js b/gemeinsamforschen/src/main/webapp/libs/js/Sidebar-Menu.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/Sidebar-Menu.js
rename to gemeinsamforschen/src/main/webapp/libs/js/Sidebar-Menu.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/annotationRest.js b/gemeinsamforschen/src/main/webapp/libs/js/annotationRest.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/annotationRest.js
rename to gemeinsamforschen/src/main/webapp/libs/js/annotationRest.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/annotationScript.js b/gemeinsamforschen/src/main/webapp/libs/js/annotationScript.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/annotationScript.js
rename to gemeinsamforschen/src/main/webapp/libs/js/annotationScript.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/annotationWebsocket.js b/gemeinsamforschen/src/main/webapp/libs/js/annotationWebsocket.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/annotationWebsocket.js
rename to gemeinsamforschen/src/main/webapp/libs/js/annotationWebsocket.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/assessmentCalculator.js b/gemeinsamforschen/src/main/webapp/libs/js/assessmentCalculator.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/assessmentCalculator.js
rename to gemeinsamforschen/src/main/webapp/libs/js/assessmentCalculator.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/changePhase.js b/gemeinsamforschen/src/main/webapp/libs/js/changePhase.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/changePhase.js
rename to gemeinsamforschen/src/main/webapp/libs/js/changePhase.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createJournal.js b/gemeinsamforschen/src/main/webapp/libs/js/createJournal.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/createJournal.js
rename to gemeinsamforschen/src/main/webapp/libs/js/createJournal.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createProject.js b/gemeinsamforschen/src/main/webapp/libs/js/createProject.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/createProject.js
rename to gemeinsamforschen/src/main/webapp/libs/js/createProject.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createQuiz.js b/gemeinsamforschen/src/main/webapp/libs/js/createQuiz.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/createQuiz.js
rename to gemeinsamforschen/src/main/webapp/libs/js/createQuiz.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportBibo.js b/gemeinsamforschen/src/main/webapp/libs/js/createReportBibo.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/createReportBibo.js
rename to gemeinsamforschen/src/main/webapp/libs/js/createReportBibo.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportConcept.js b/gemeinsamforschen/src/main/webapp/libs/js/createReportConcept.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/createReportConcept.js
rename to gemeinsamforschen/src/main/webapp/libs/js/createReportConcept.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportDo.js b/gemeinsamforschen/src/main/webapp/libs/js/createReportDo.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/createReportDo.js
rename to gemeinsamforschen/src/main/webapp/libs/js/createReportDo.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportEvaluation.js b/gemeinsamforschen/src/main/webapp/libs/js/createReportEvaluation.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/createReportEvaluation.js
rename to gemeinsamforschen/src/main/webapp/libs/js/createReportEvaluation.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportMethod.js b/gemeinsamforschen/src/main/webapp/libs/js/createReportMethod.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/createReportMethod.js
rename to gemeinsamforschen/src/main/webapp/libs/js/createReportMethod.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportOverview.js b/gemeinsamforschen/src/main/webapp/libs/js/createReportOverview.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/createReportOverview.js
rename to gemeinsamforschen/src/main/webapp/libs/js/createReportOverview.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportProgress.js b/gemeinsamforschen/src/main/webapp/libs/js/createReportProgress.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/createReportProgress.js
rename to gemeinsamforschen/src/main/webapp/libs/js/createReportProgress.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportQuestion.js b/gemeinsamforschen/src/main/webapp/libs/js/createReportQuestion.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/createReportQuestion.js
rename to gemeinsamforschen/src/main/webapp/libs/js/createReportQuestion.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportRecherche.js b/gemeinsamforschen/src/main/webapp/libs/js/createReportRecherche.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/createReportRecherche.js
rename to gemeinsamforschen/src/main/webapp/libs/js/createReportRecherche.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createReportTitle.js b/gemeinsamforschen/src/main/webapp/libs/js/createReportTitle.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/createReportTitle.js
rename to gemeinsamforschen/src/main/webapp/libs/js/createReportTitle.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js b/gemeinsamforschen/src/main/webapp/libs/js/e-portfolio.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js
rename to gemeinsamforschen/src/main/webapp/libs/js/e-portfolio.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/editDescription.js b/gemeinsamforschen/src/main/webapp/libs/js/editDescription.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/editDescription.js
rename to gemeinsamforschen/src/main/webapp/libs/js/editDescription.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/enrollProject.js b/gemeinsamforschen/src/main/webapp/libs/js/enrollProject.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/enrollProject.js
rename to gemeinsamforschen/src/main/webapp/libs/js/enrollProject.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/finalAssessment.js b/gemeinsamforschen/src/main/webapp/libs/js/finalAssessment.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/finalAssessment.js
rename to gemeinsamforschen/src/main/webapp/libs/js/finalAssessment.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/footer.js b/gemeinsamforschen/src/main/webapp/libs/js/footer.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/footer.js
rename to gemeinsamforschen/src/main/webapp/libs/js/footer.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/givepeerfeedback.js b/gemeinsamforschen/src/main/webapp/libs/js/givepeerfeedback.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/givepeerfeedback.js
rename to gemeinsamforschen/src/main/webapp/libs/js/givepeerfeedback.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/grading.js b/gemeinsamforschen/src/main/webapp/libs/js/grading.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/grading.js
rename to gemeinsamforschen/src/main/webapp/libs/js/grading.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/jquery.min.js b/gemeinsamforschen/src/main/webapp/libs/js/jquery.min.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/jquery.min.js
rename to gemeinsamforschen/src/main/webapp/libs/js/jquery.min.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/jquery.tagsinput.js b/gemeinsamforschen/src/main/webapp/libs/js/jquery.tagsinput.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/jquery.tagsinput.js
rename to gemeinsamforschen/src/main/webapp/libs/js/jquery.tagsinput.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/overview-docent.js b/gemeinsamforschen/src/main/webapp/libs/js/overview-docent.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/overview-docent.js
rename to gemeinsamforschen/src/main/webapp/libs/js/overview-docent.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/overview-student.js b/gemeinsamforschen/src/main/webapp/libs/js/overview-student.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/overview-student.js
rename to gemeinsamforschen/src/main/webapp/libs/js/overview-student.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/peerfeedback.js b/gemeinsamforschen/src/main/webapp/libs/js/peerfeedback.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/peerfeedback.js
rename to gemeinsamforschen/src/main/webapp/libs/js/peerfeedback.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/profile.js b/gemeinsamforschen/src/main/webapp/libs/js/profile.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/profile.js
rename to gemeinsamforschen/src/main/webapp/libs/js/profile.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/project-student.js b/gemeinsamforschen/src/main/webapp/libs/js/project-student.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/project-student.js
rename to gemeinsamforschen/src/main/webapp/libs/js/project-student.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/project-student.js.orig b/gemeinsamforschen/src/main/webapp/libs/js/project-student.js.orig
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/project-student.js.orig
rename to gemeinsamforschen/src/main/webapp/libs/js/project-student.js.orig
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/rateContribution.js b/gemeinsamforschen/src/main/webapp/libs/js/rateContribution.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/rateContribution.js
rename to gemeinsamforschen/src/main/webapp/libs/js/rateContribution.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/register.js b/gemeinsamforschen/src/main/webapp/libs/js/register.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/register.js
rename to gemeinsamforschen/src/main/webapp/libs/js/register.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/researchReportUpload.js b/gemeinsamforschen/src/main/webapp/libs/js/researchReportUpload.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/researchReportUpload.js
rename to gemeinsamforschen/src/main/webapp/libs/js/researchReportUpload.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/showProjects.js b/gemeinsamforschen/src/main/webapp/libs/js/showProjects.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/showProjects.js
rename to gemeinsamforschen/src/main/webapp/libs/js/showProjects.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/specificRequirement.js b/gemeinsamforschen/src/main/webapp/libs/js/specificRequirement.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/specificRequirement.js
rename to gemeinsamforschen/src/main/webapp/libs/js/specificRequirement.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/specificSkills.js b/gemeinsamforschen/src/main/webapp/libs/js/specificSkills.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/specificSkills.js
rename to gemeinsamforschen/src/main/webapp/libs/js/specificSkills.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/takeQuiz.js b/gemeinsamforschen/src/main/webapp/libs/js/takeQuiz.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/takeQuiz.js
rename to gemeinsamforschen/src/main/webapp/libs/js/takeQuiz.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/unstructuredAnnotation.js b/gemeinsamforschen/src/main/webapp/libs/js/unstructuredAnnotation.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/unstructuredAnnotation.js
rename to gemeinsamforschen/src/main/webapp/libs/js/unstructuredAnnotation.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/unstructuredRest.js b/gemeinsamforschen/src/main/webapp/libs/js/unstructuredRest.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/unstructuredRest.js
rename to gemeinsamforschen/src/main/webapp/libs/js/unstructuredRest.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/unstructuredUpload.js b/gemeinsamforschen/src/main/webapp/libs/js/unstructuredUpload.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/unstructuredUpload.js
rename to gemeinsamforschen/src/main/webapp/libs/js/unstructuredUpload.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/utility.js b/gemeinsamforschen/src/main/webapp/libs/js/utility.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/utility.js
rename to gemeinsamforschen/src/main/webapp/libs/js/utility.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/viewQuiz.js b/gemeinsamforschen/src/main/webapp/libs/js/viewQuiz.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assets/js/viewQuiz.js
rename to gemeinsamforschen/src/main/webapp/libs/js/viewQuiz.js