Merge https://github.com/fredxie/Vooga_3

Conflicts:
	.classpath
	.settings/org.eclipse.jdt.core.prefs
	Lib/ssj.jar
	bin/.DS_Store
	bin/ai/Level1.class
	bin/ai/Level2.class
	bin/ai/Level3$1.class
	bin/ai/Level3.class
	bin/ai/Level4$1.class
	bin/ai/Level4.class
	bin/ai/Level5$1.class
	bin/ai/Level5$2.class
	bin/ai/Level5$3.class
	bin/ai/Level5.class
	bin/ai/ScoreLimit.class
	bin/demo/DemoBonus.class
	bin/demo/DemoEnemy.class
	bin/demo/DemoFighter.class
	bin/demo/DemoGameEngine.class
	bin/demo/DemoPlayField.class
	bin/element/Block.class
	bin/element/Bullet.class
	bin/element/Fighter.class
	bin/element/Laser.class
	bin/element/Missile.class
	bin/element/RegularFighter.class
	bin/element/Satellite.class
	bin/element/TopDownPlayField.class
	bin/game/Configuration.class
	bin/hud/HUD.class
	bin/hud/LevelInfo.class
	bin/hud/ScoreInfo.class
	bin/images/2d.jpg
	bin/images/ChipSet1.png
	bin/images/Satellite.png
	bin/images/background.jpg
	bin/images/background1.jpg
	bin/images/background2.jpg
	bin/images/background3.jpg
	bin/images/beam3.png
	bin/images/bigLaser1.png
	bin/images/bullet.png
	bin/images/bullet_7.png
	bin/images/charset.png
	bin/images/emissle1.png
	bin/images/enemy1.png
	bin/images/enemy_bullet.png
	bin/images/explosion.png
	bin/images/fighter.png
	bin/images/font.png
	bin/images/missle.png
	bin/images/tank.jpg
	bin/images/tank_back.jpg
	bin/images/tank_front.jpg
	bin/images/tiles.png
	bin/images/title.png
	bin/keyconfiguration/Key.class
	bin/keyconfiguration/KeyAnnotation.class
	bin/keyconfiguration/KeyConfig.class
	bin/keyconfiguration/KeyObserver.class
	bin/levelEditor/ImageLabel$1.class
	bin/levelEditor/ImageLabel$2.class
	bin/levelEditor/ImageLabel$3.class
	bin/levelEditor/ImageLabel.class
	bin/levelEditor/LevelEditor$1.class
	bin/levelEditor/LevelEditor$2.class
	bin/levelEditor/LevelEditor$3.class
	bin/levelEditor/LevelEditor$4.class
	bin/levelEditor/LevelEditor$5.class
	bin/levelEditor/LevelEditor$6.class
	bin/levelEditor/LevelEditor.class
	bin/menu/GameSL$1.class
	bin/menu/GameSL$2.class
	bin/menu/GameSL.class
	bin/util/TopDownAreaUtil.class
	images/game/BitmapFont.png
	images/game/base.png
	images/game/cannon.png
	images/game/emissle_easy.png
	images/game/explosion.png
	src/demo/DemoBlock.java
	src/demo/DemoCannonBlock.java
	src/demo/DemoEnemy.java
	src/demo/DemoFighter.java
	src/demo/DemoProtection.java
	src/element/AutoFighter.java
	src/element/Bullet.java
	src/element/Enemy.java
	src/element/Fighter.java
	src/element/Laser.java
	src/element/Missile.java
	src/element/PhysicalProtection.java
	src/element/RegularEnemy.java
	src/element/RegularFighter.java
	src/element/Satellite.java
	src/element/SpawnByTime.java
	src/game/TopDownVolatileElement.java
	src/gameObject/GameLevel1.java
	src/gameObject/GameLevel2.java
	src/hud/HUD.java
	src/hud/HUDInfo.java
	src/hud/LevelInfo.java
	src/hud/LifeInfo.java
	src/hud/ScoreInfo.java
	src/hud/WeaponInfo.java
	src/images/2d.jpg
	src/images/ChipSet1.png
	src/images/Satellite.png
	src/images/background.jpg
	src/images/background1.jpg
	src/images/background2.jpg
	src/images/background3.jpg
	src/images/beam3.png
	src/images/bigLaser1.png
	src/images/bullet.png
	src/images/bullet_7.png
	src/images/charset.png
	src/images/emissle1.png
	src/images/enemy1.png
	src/images/enemy_bullet.png
	src/images/explosion.png
	src/images/fighter.png
	src/images/font.png
	src/images/missle.png
	src/images/tank.jpg
	src/images/tank_back.jpg
	src/images/tank_front.jpg
	src/images/tiles.png
	src/images/title.png
	src/levelEditor/DragImage.java
	src/levelEditor/ImageLabel.java
	src/levelEditor/ImagePanel.java
	src/levelEditor/LevelEditor.java
	src/menu/TopDownMenu.java