Merge branch 'master' of github.com:jokerx3/prp

Conflicts:
	HeatUp/.classpath

.gitignore

@@ -10,3 +10,4 @@ tmp/
 local.properties
 .settings/
 .loadpath
+.classpath

HeatUp/.classpath

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

HeatUp/src/de/heatup/mapengine/MapEngine.java

@@ -1,4 +1,4 @@
-package mapEngine;
+
 
 import java.awt.Color;
 import java.io.File;
@@ -12,7 +12,7 @@ import java.util.Stack;
 
 import javax.swing.JPanel;
 
-import mapEngine2.Objekt;
+import de.heatup.objects.*;
 
 public class MapEngine {
 	int[][] tiles;

HeatUp/src/de/heatup/objects/Objekt.java

@@ -45,15 +45,15 @@ public class Objekt {
 		switch (objectIdentifier) {
 		case '1':
 			//leiterbahn  
-			objectFilename="images/25x25_black.png";
+			objectFilename="../resources/images/25x25_black.png";
 			break;
 		case '2':
 			//2:harware
-			objectFilename="images/25x25_red.png";
+			objectFilename="../resources/images/25x25_red.png";
 			break;
 		case '3':
 			//3:wand
-			objectFilename="images/25x25_blue.png";
+			objectFilename="../resources/images/25x25_blue.png";
 			break;
 		default:
 			objectFilename="images/25x25_orange.png";