Merge remote-tracking branch 'origin/sprint2-network' into gui-sprint2
Better 'inactive' effect
Added automatically generated UML Class Diagram. Created with ObjectAid UML Explorer plugin, can be installed from update site http://www.objectaid.net/update
Untangled class diagram
Fixed Fränzis test-only code I 'accidentally' merged into my branch
GameRule is now used for board creation, upped board size to 12 to show
Added custom fonts. They're both public domain and from http://www.1001fonts.com/overhaul-font.html and http://www.1001fonts.com/thin-pencil-handwriting-font.html
Used wrong font
Text alignment's a bitch
Added Battleship MS Project files
Reversed change to default boardSize in GameRule
Implemented rollback if moveShip() is invalid.
Also improved JavaDoc for GenericShip
Merge remote-tracking branch 'origin/gui-sprint2' into gamelogic-sprint2
Updated JavaDoc for Board* and GenericPlayer
Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7301.w2013.battleship.git into sprint2-network
change network