Cleaned up diary CSS and JS (so our project will show up as "Java" project on GitHub)
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
Merge remote-tracking branch 'origin/master' into gui-sprint4
Merge remote-tracking branch 'origin/sprint4-network' into gui-sprint4
Forgot some files before...