Merge pull request #744 from Viper-7/master

CHANGED: Tell Minecraft to use the system proxy too if the user checks the box in the options tab
retire legacy MinecraftLauncher -- everything now uses the newer code
fix merge conflicts
FIXED: Locale again...