Merge branch 'master' of https://github.com/Lusito/GameDevWeek
incomplete music
Removed dummy loader
First test of text animation
Merge branch 'master' of https://github.com/Lusito/GameDevWeek
Merge branch 'master' of https://github.com/Lusito/GameDevWeek
Merge branch 'master' of https://github.com/Lusito/GameDevWeek
Merge branch 'master' of https://github.com/Lusito/GameDevWeek
Merge branch 'master' of https://github.com/Lusito/GameDevWeek
Merge Commit
adjusted dogpat / dogspawns for new convention ( ids, pat via dogpat ids)

Names: dogspawn (id: int
		  pat:dogpat.id,dogpat.id)
	dogpat  (id)
added getter/setter ad listener for cat states
Merge branch 'master' of github.com:Lusito/GameDevWeek

Conflicts:
	gdx-kitten-rescue/src/main/java/de/hochschuletrier/gdw/ss14/ecs/systems/CatMovementSystem.java
	gdx-kitten-rescue/src/main/java/de/hochschuletrier/gdw/ss14/ecs/systems/CatStateUpdateSystem.java
fixed isFinished within AnimationComponent
minor fixes
Merge branch 'master' of https://github.com/Lusito/GameDevWeek
Merge branch 'master' of https://github.com/Lusito/GameDevWeek into physik-master
Merge branch 'master' of https://github.com/Lusito/GameDevWeek

Conflicts:
	gdx-test/src/main/java/de/hochschuletrier/gdw/ss14/Main.java
	gdx-test/src/main/java/de/hochschuletrier/gdw/ss14/sandbox/credits/AnimatorController.java
	gdx-test/src/main/java/de/hochschuletrier/gdw/ss14/sandbox/credits/Credits.java
	gdx-test/src/main/java/de/hochschuletrier/gdw/ss14/sandbox/credits/animator/AnimatorData.java
	gdx-test/src/main/resources/data/json/credits.json
	gdx-test/src/main/resources/data/json/music.json
Merge branch 'master' of https://github.com/Lusito/GameDevWeek
Jump-Glitsch behoben