...
Merge branch 'master' of https://github.com/Lusito/GameDevWeek.git
Merge branch 'master' of https://github.com/Lusito/GameDevWeek.git
Merge branch 'master' of https://github.com/Lusito/GameDevWeek.git
Merge branch 'master' of https://github.com/Lusito/GameDevWeek.git
BeginnCommit oder so...
Anfang DogBehaviour und Knotenbasteln
DogBehaviour ohne Fehler temporär
Merge branch 'master' of https://github.com/Lusito/GameDevWeek.git
weitergebastelt-pullcommit
Merge branch 'master' of https://github.com/Lusito/GameDevWeek.git

Conflicts:
	gdw-commons/src/main/java/de/hochschuletrier/gdw/commons/ai/behaviourtree/nodes/BaseCondition.java
Package added
update + render methods added
UntilFailDecorator gelöscht weil schon vorhanden, DogBehaviour
gebastelt(teil), Pull-Commit.
Merge branch 'master' of https://github.com/Lusito/GameDevWeek.git
Katzenleben IngameUI
Pull-commit Dog behaviour bebastelt
WaterlevelUI added
katzenleben
Merge branch 'ingame-ui' of https://github.com/Lusito/GameDevWeek into ingame-ui