Sunk ships are now rendered. JavaFX is coooool!!!
Cleaned up diary CSS and JS (so our project will show up as "Java" project on GitHub)
Merge remote-tracking branch 'origin/master' into gamelogic-sprint4
changed NetworkScanner and Listener fix
Merge remote-tracking branch 'origin/master' into sprint4-network

Conflicts:
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/network/ConnectionListener.java
Reformatted
GUI improvements are on their way...
Merge remote-tracking branch 'origin/master' into gui-sprint4
Merge remote-tracking branch 'origin/sprint4-network' into gui-sprint4
Forgot some files before...
Merge remote-tracking branch 'origin/gamelogic-sprint4' into gui-sprint4
Added sound effects (still missing a big splash, thoug)
Added gradle as build system to easily make deployable packages. Everything should work as before except that Battleship.java now is called Main.java (which fixes the conflict that we had two Battleship.java files) and the tests are in src/test/java now. If you wish to build it with gradle, just install it from gradle.org and call 'gradle assemble'.
Made height dynamic, so it scales with the board size.
Tests work now with gradle (except that they fail) and added more icon resolutions
Merge remote-tracking branch 'origin/gui-sprint4' into gamelogic-sprint4