resolve conflicts
change in NetworkDiscovery
implemented keepalive for Connection
Additional implementation details
 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
changed connection interruption mechanism
change keepalive and network reestablishment functionality
Merge remote-tracking branch 'origin/network-sprint5' into network-sprint5

Conflicts:
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/network/Connection.java
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/network/ConnectionHandler.java
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/network/ConnectionKeepalive.java
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/network/DiscoverySocketSender.java