Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7301.w2013.battleship.git into sprint2-network
Merge remote-tracking branch 'origin/gui-sprint2' into sprint2-network
Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7301.w2013.battleship.git into sprint2-network
Merge remote-tracking branch 'origin/gui-sprint2' into sprint2-network
Merge remote-tracking branch 'origin/gui-sprint2' into sprint2-network
Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7301.w2013.battleship.git into sprint2-network
merge and self play
Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7301.w2013.battleship.git into sprint2-network
merge
Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7301.w2013.battleship.git into sprint2-network
change network
work on error handling in network
merge
add networkScanner
Merge remote-tracking branch 'origin/sprint2-network' into gui-sprint3
Updated class diagram
NetworkListener
Merge remote-tracking branch 'origin/sprint2-network'