Merge remote-tracking branch 'origin/develop' into develop

Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/Mineplexer.java

@@ -23,7 +23,7 @@ public class Mineplexer extends Plugin
 				Handler sentry = new SentryHandler(new DefaultRavenFactory().createRavenInstance(
 						new Dsn("https://470f12378af3453ba089e0c0a0c9aae6:292516b722594784807aebb06db8ec38@app.getsentry.com/66323"
 						)));
-				sentry.setLevel(Level.WARNING);
+				sentry.setLevel(Level.SEVERE);
 				getProxy().getLogger().addHandler(sentry);
 			}
 		});

Plugins/Mineplex.ServerData/pom.xml

@@ -17,13 +17,16 @@
             <artifactId>gson</artifactId>
         </dependency>
         <dependency>
-            <groupId>redis.clients</groupId>
+            <groupId>mysql</groupId>
-            <artifactId>jedis</artifactId>
+            <artifactId>mysql-connector-java</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-dbcp2</artifactId>
-            <version>2.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
         </dependency>
     </dependencies>
 </project>

Plugins/pom.xml

@@ -77,6 +77,12 @@
                 <version>1.4.7</version>
                 <scope>compile</scope>
             </dependency>
+            <dependency>
+                <groupId>mysql</groupId>
+                <artifactId>mysql-connector-java</artifactId>
+                <version>5.1.14</version>
+                <scope>compile</scope>
+            </dependency>
             <dependency>
                 <groupId>net.kencochrane.raven</groupId>
                 <artifactId>raven</artifactId>