Constants reorganisation
Merge branch 'master' of https://github.com/caver115/minelauncher16x

Conflicts:
	src/net/minecraft/launcher/LauncherConstants.java