Merge remote-tracking branch 'origin/network-sprint5' into gui-sprint5
Setting Panel work in progress
Merge remote-tracking branch 'origin/network-sprint5' into gui-sprint5
Added random name, name setting and better discovery listener that doesn't add the same peer every 5 seconds
The player name is now updated, also fixed a problem when player names differ in length
Life update for name changes. Also, there is code to filter out the player's own IPs, but it's deactivated for now.
Now let's ignore the local addresses
Changed discovering technology to multicast, which seems to work - at least partially
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