Server changes, hangs now.
Merge branch 'master' of github.com:jwraats/Stratego

Conflicts:
	src/server/view/ServerFrame.java