Merge remote-tracking branch 'remotes/original/master' into upstream

# Conflicts:
#	src/itdelatrisu/opsu/objects/Slider.java

src/itdelatrisu/opsu/downloads/servers/HexideServer.java

@@ -33,6 +33,8 @@ import org.json.JSONObject;
 
 /**
  * Download server: https://osu.hexide.com/
+ * <p>
+ * <i>This server went offline in 2016.</i>
  */
 public class HexideServer extends DownloadServer {
 	/** Server name. */