Slightly better colours
Merge remote-tracking branch 'origin/gamelogic-sprint1'

Conflicts:
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/Battleship.java
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/game/Board.java
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/game/ships/GenericShip.java
Merge remote-tracking branch 'origin/gamelogic-sprint1'
Incoorporated Simon's improvements
Merge remote-tracking branch 'origin/Sprint1-Network'
Merge remote-tracking branch 'origin/gamelogic-sprint1'
Merge remote-tracking branch 'origin/gamelogic-sprint1'

Conflicts:
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/game/ships/GenericShip.java
A trivial MissileView
Moved classes from "w2012" to "w2013"
Changed Brainstorming
Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7301.w2013.battleship.git
Merge branch 'master' into Sprint1-Network