few changes
Merge branch 'master' of
https://github.com/BBK-PiJ-2012-86/PokerProject.git

Conflicts:
	src/poker/manager_player/GameManager.java
	src/poker/manager_player/GameManagerImpl.java
readded gamemanager and gamemanagerimpl