Merge branch 'master' of https://github.com/Slowpoke101/FTBLaunch

Conflicts:
	src/net/ftb/gui/LaunchFrame.java
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# All conflicts fixed but you are still merging.
#   (use "git commit" to conclude merge)
#
# Changes to be committed:
#
#	modified:   build.gradle
#	renamed:    pom.xml -> pom.xml.unused
#	modified:   src/net/ftb/data/ModPack.java
#	modified:   src/net/ftb/gui/LaunchFrame.java
#	modified:   src/net/ftb/gui/dialogs/ModPackVersionChangeDialog.java
#	modified:   src/net/ftb/mclauncher/MinecraftLauncher.java
#	modified:   src/net/ftb/mclauncher/MinecraftLauncherNew.java
#	modified:   src/net/ftb/tools/ModManager.java
#	modified:   src/net/ftb/tools/TextureManager.java
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	config/
#	dependency-reduced-pom.xml