Merge fixes
Working on new gui elements, prepping for merge
Merge branch 'master' of https://github.com/CruorVolt/PTTT

Conflicts:
	polar/game/styles/DifferencePlayStyle.java
	polar/game/styles/TDMinPlayStyle.java
	polar/gui/GameWindow.java

Optional play locks on all players
Merge branch 'master' of https://github.com/CruorVolt/PTTT