Changed the Client for testing the Client Server connection.
hope it works this time.
Merge branch 'master' of https://github.com/derintendant/Unholy-Wrestling-Dystopia

Conflicts:
	MIGLogin/MIGLoginClient/nbproject/genfiles.properties
	MIGLogin/MIGMain/nbproject/project.properties
	MIGLogin/MIGXmlRpcClient/build/built-jar.properties
Fixed the Server so it accepts now requests from the Client and sends an response.
added private.xml to ignore
Gitignore file updated
Merge branch 'master' of https://github.com/derintendant/Mighty-Heroes

Conflicts:
	.gitignore

Merged Thomas changes
Start work on new Feature: Statemanagment
This is requiered to provide the general Architektural design.
Start work on new Feature: Statemanagment
This is requiered to provide the general Architektural design.
changed some props
Changed settings to not build platform specific launchers
resolve conflicts
Removed Private settings files
repaired version
Included Thomas’ repairs.

Merge commit '8f18da0a990ad73cbf1a5c1080c9bb445c468643'

* commit '8f18da0a990ad73cbf1a5c1080c9bb445c468643':
  repaired version
  resolve conflicts
  Start work on new Feature: Statemanagment This is requiered to provide the general Architektural design.
  Start work on new Feature: Statemanagment This is requiered to provide the general Architektural design.
  gitignore-Updates + build-File-Updates!

Conflicts:
	MIGLogin/MIGMain/nbproject/project.properties
edited .gitignore
actual version synchronized
Merge remote-tracking branch 'Upstream/master'

Conflicts:
	.gitignore
Merge remote-tracking branch 'Dennis/master' into secure_commit
.gitignore changes