Test
Merge branch 'master' of https://github.com/Lusito/GameDevWeek

Conflicts:
	gdx-kitten-rescue/src/main/java/de/hochschuletrier/gdw/ss14/ecs/systems/DogInputSystem.java
	gdx-kitten-rescue/src/main/java/de/hochschuletrier/gdw/ss14/ecs/systems/MovementSystem.java
Merge branch 'master' of https://github.com/Lusito/GameDevWeek

Conflicts:
	gdx-kitten-rescue/src/main/java/de/hochschuletrier/gdw/ss14/ecs/systems/DogInputSystem.java
Merge branch 'master' of https://github.com/Lusito/GameDevWeek
Test
Implement LaserPointer On/Off
Merge branch 'master' of https://github.com/Lusito/GameDevWeek

Conflicts:
	gdx-kitten-rescue/src/main/java/de/hochschuletrier/gdw/ss14/ecs/systems/PlayerMovementSystem.java
	gdx-kitten-rescue/src/main/java/de/hochschuletrier/gdw/ss14/game/Game.java
Merge branch 'master' of https://github.com/Lusito/GameDevWeek

Conflicts:
	gdx-kitten-rescue/src/main/java/de/hochschuletrier/gdw/ss14/ecs/EntityFactory.java
	gdx-kitten-rescue/src/main/java/de/hochschuletrier/gdw/ss14/ecs/systems/MovementSystem.java
Merge branch 'master' of https://github.com/Lusito/GameDevWeek

Conflicts:
	gdx-kitten-rescue/src/main/java/de/hochschuletrier/gdw/ss14/game/Game.java
Merge branch 'master' of https://github.com/Lusito/GameDevWeek
added collision, made listener work and some other utils
Update MainMenu
Merge branch 'master' of https://github.com/Lusito/GameDevWeek
Added particle emitter system and component.
Added limited lifetime component and system to limit the lifetime of an
entity.
Merge branch 'master' of github.com:Lusito/GameDevWeek

Conflicts:
	gdx-kitten-rescue/src/main/java/de/hochschuletrier/gdw/ss14/ecs/EntityFactory.java
	gdx-kitten-rescue/src/main/java/de/hochschuletrier/gdw/ss14/game/Game.java
Merge branch 'master' of https://github.com/Lusito/GameDevWeek.git

Conflicts:
	gdx-kitten-rescue/src/main/java/de/hochschuletrier/gdw/ss14/game/Game.java
Merge branch 'master' of github.com:Lusito/GameDevWeek
Merge branch 'master' of github.com:Lusito/GameDevWeek

Conflicts:
	gdx-kitten-rescue/src/main/java/de/hochschuletrier/gdw/ss14/game/Game.java
fixed buttonlisterner for UI Team
minor issue