change in NetworkDiscovery
Merge remote-tracking branch 'origin/master' into network-sprint5

Conflicts:
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/network/DiscoverySocketListener.java
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/network/DiscoverySocketSender.java
implemented keepalive for Connection
Merge branch 'master' of git@github.com:simonkrenger/ch.bfh.bti7301.w2013.battleship.git into network-sprint5

Conflicts:
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/network/DiscoverySocketListener.java
Merge branch 'master' of git@github.com:simonkrenger/ch.bfh.bti7301.w2013.battleship.git into network-sprint5
 keepalive loop
moved socket timeout configuration
Keepalive Object
make Keepalive Object serializable
change serializable id of keepalive object
fixeing connection
changed keepalive to integer
add tigger
Let's try synchronisation
add syso for debugging in network
Merge branch 'master' of git@github.com:simonkrenger/ch.bfh.bti7301.w2013.battleship.git into network-sprint5
Merge remote-tracking branch 'origin/network-sprint5' into network-sprint5
Maybe I fixed the problem where the game gets stuck (maybe not yet)
resolve conflicts
change in NetworkDiscovery