Merge remote-tracking branch 'origin/3.0' into 3.0

Conflicts:
	QuickLaunch/settings.properties

QuickLaunch/File.txt

@@ -8,13 +8,3 @@ f
 f
 g
 g
-h
-h
-i
-i
-j
-j
-k
-k
-l
-l

QuickLaunch/settings.properties

@@ -2,4 +2,4 @@
 Load-File-on-startup=true
 key2=44
 key1=29
-Check-for-updates-on-startup=true
+Check-for-updates-on-startup=true

QuickLaunch/src/update/UpdateChecker.java

@@ -14,7 +14,7 @@ public class UpdateChecker {
 	public void requestServerData(){
 		try {
 			Socket socket = new Socket();
-			socket.connect(new InetSocketAddress(InetAddress.getByName("cookiestudios.org"), 9999), 2000);
+			socket.connect(new InetSocketAddress(InetAddress.getByName(/*"cookiestudios.org"*/"localhost"), 9999), 2000);
 			DataInputStream in = new DataInputStream(socket.getInputStream());
 			DataOutputStream out = new DataOutputStream(socket.getOutputStream());