fixed last merge + little changes with running application.
Merge branch 'master' of https://github.com/Zixxy/PokerTCS.git