Merge branch 'master' of https://github.com/ModdingX/LauncherLib

# Conflicts:
#	build.gradle
#	gradle.properties
#	gradle/wrapper/gradle-wrapper.jar
#	gradle/wrapper/gradle-wrapper.properties
#	gradlew
#	src/main/java/org/moddingx/launcherlib/launcher/VersionInfo.java
#	src/main/java/org/moddingx/launcherlib/mappings/MappingHelper.java
#	src/main/java/org/moddingx/launcherlib/mappings/MappingWriter.java