Items in LevelEditor fixed, PortalLocation fixed, enkele levels aangepast
Final version... or is it?
Merge branch 'master' of https://github.com/Rivirland/EWI3620TU-GROUP01

Conflicts:
	MazeRunner/bin/engine/Animator.class
	MazeRunner/bin/engine/ChangeGL.class
	MazeRunner/bin/engine/GeneticAlgorithm.class
	MazeRunner/bin/engine/Maze.class
	MazeRunner/bin/engine/MazeRunner.class
	MazeRunner/bin/engine/Portal.class
	MazeRunner/bin/engine/UserInput.class
	MazeRunner/bin/items/Roof.class
	MazeRunner/bin/items/TrapDropped.class
	MazeRunner/bin/levelEditor/Catalogus.class
	MazeRunner/bin/levelEditor/LevelEditor.class
	MazeRunner/bin/levelEditor/LevelEditorWorldViewer.class
	MazeRunner/bin/menu/Main.class
	MazeRunner/bin/model/OBJLoader.class
	MazeRunner/db/mydatabase.db
	MazeRunner/levels/basename.txt
	MazeRunner/src/engine/Maze.java
	MazeRunner/src/engine/Portal.java
	MazeRunner/src/items/Roof.java
	MazeRunner/src/levelEditor/LevelEditor.java
	MazeRunner/src/model/OBJLoader.java
	MazeRunner/textures/earthtexture.jpg