Merge branch 'master' into devel

.gitignore

@@ -18,3 +18,5 @@ classes/artifacts/Discord_Stroumpf_Beta_jar/
 src/main/resources/templates/css
 
 src/main/resources/templates/js
+
+\.directory

Jenkinsfile

@@ -2,7 +2,7 @@ node {
     def app
    stage('Clone') { // for display purposes
       // Get some code from a GitHub repository
-      git url: 'https://github.com/BrokenFire/BrokenDiscordBot.git', branch: 'devel'
+      git 'https://github.com/BrokenFire/BrokenDiscordBot.git'
    }
    stage('Build image') {
         /* This builds the actual image; synonymous to
@@ -15,10 +15,11 @@ node {
          * First, the incremental build number from Jenkins
          * Second, the 'latest' tag.
          * Pushing multiple tags is cheap, as all the layers are reused. */
-        app.push("devel") 
+        app.push()
         
     }
     stage('Cleaning'){
         sh "docker image prune -f"
+        build job: 'Bot Discord javadoc', wait: false
     }
 } 

README.md

@@ -1,5 +1,5 @@
 # BrokenDiscordBot
-Master:<br/> [![Build Status](https://jenkins.seb6596.ovh/buildStatus/icon?job=BrokenDiscordBot/master)](https://jenkins.seb6596.ovh/job/BrokenDiscordBot/job/master/)
+Master:<br/>[![Build Status](https://jenkins.seb6596.ovh/job/Bot%20Discord%20Gradle/badge/icon)](https://jenkins.seb6596.ovh/job/Bot%20Discord%20Gradle/)
 
 Devel: <br/>[![Build Status](https://jenkins.seb6596.ovh/buildStatus/icon?job=BrokenDiscordBot/devel)](https://jenkins.seb6596.ovh/job/BrokenDiscordBot/job/devel/)
 
@@ -70,6 +70,10 @@ Devel: <br/>[![Build Status](https://jenkins.seb6596.ovh/buildStatus/icon?job=Br
 > ```
 > Docker hub [repo](https://hub.docker.com/r/brokenfire/brokendiscordbot/)
 
+### [Javadoc](https://jenkins.seb6596.ovh/job/Bot%20Discord%20Gradle/javadoc/)
+
+### [Jenkins](https://jenkins.seb6596.ovh/job/Bot%20Discord%20Gradle/)
+
 #### Jenkisfile
 `git config --global merge.ours.driver true`