Merge remote-tracking branch 'origin/master'

Author: Cubxity

src/main/java/cc/hyperium/installer/api/Installer.java

@@ -10,7 +10,7 @@
 import cc.hyperium.installer.api.entities.internal.AddonManifestParser;
 import cc.hyperium.utils.DownloadTask;
 import cc.hyperium.utils.InstallerUtils;
-import cc.hyperium.utils.JsonHolder;
+import cc.hyperium.installer.utils.JsonHolder;
 import com.google.common.io.Files;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonPrimitive;

…n/java/cc/hyperium/utils/JsonHolder.java …hyperium/installer/utils/JsonHolder.javasrc/main/java/cc/hyperium/utils/JsonHolder.java renamed to src/main/java/cc/hyperium/installer/utils/JsonHolder.java src/main/java/cc/hyperium/utils/JsonHolder.java renamed to src/main/java/cc/hyperium/installer/utils/JsonHolder.java

@@ -15,7 +15,7 @@
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package cc.hyperium.utils;
+package cc.hyperium.installer.utils;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;

src/main/java/cc/hyperium/utils/InstallerUtils.java

@@ -1,6 +1,7 @@
 package cc.hyperium.utils;
 
 import cc.hyperium.installer.api.entities.InstallerManifest;
+import cc.hyperium.installer.utils.JsonHolder;
 import com.google.gson.Gson;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.client.HttpClient;