more stuff
even more stuff
all the stuff one should ever need
other stuff
Merge branch 'event-system_rewrite' into event-system-2.0

Conflicts:
	core/assets/maps/test01
	core/src/main/java/de/secondsystem/game01/impl/game/MainGameState.java
	core/src/main/java/de/secondsystem/game01/impl/game/controller/PatrollingController.java
	core/src/main/java/de/secondsystem/game01/impl/game/entities/ControllableGameEntity.java
	core/src/main/java/de/secondsystem/game01/impl/game/entities/GameEntity.java
	core/src/main/java/de/secondsystem/game01/impl/game/entities/GameEntityManager.java
	core/src/main/java/de/secondsystem/game01/impl/game/entities/IGameEntity.java
	core/src/main/java/de/secondsystem/game01/impl/game/entities/IGameEntityManager.java
	core/src/main/java/de/secondsystem/game01/impl/map/GameMap.java
	core/src/main/java/de/secondsystem/game01/impl/map/IGameMap.java
	core/src/main/java/de/secondsystem/game01/impl/map/JsonGameMapSerializer.java
	core/src/main/java/de/secondsystem/game01/impl/scripting/ScriptEnvironment.java
-
Merge pull request #12 from mephistopheles42/event-system-2.0

EventSystem 2.0