ant
ivan libs
Merge branch 'master' of https://github.com/articsoka/poker-player-java
IT.
GameState parsing
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/articsoka/poker-player-java
Strategy
Mapper
Unignore JsonMapper Test
teszt ignore
strategy manager
Merge branch 'master' of git@sanyi:/var/git/poker-player-java.git
strategy manager
Merge branch 'master' of git@sanyi:/var/git/poker-player-java.git
fix
Mapper fixes
start.sh
strategy
Merge branch 'master' of sanyi:/var/git/poker-player-java

Conflicts:
	src/main/java/org/leanpoker/player/PlayerServlet.java