Some gui adjustments
Merge branch 'master' of https://github.com/PokerTeam/NewPoker

Conflicts:
	.gitignore