Chanes in Network package
Merge branch 'master' into Sprint1-Network
Changes to network package, added a GameState Enum to game oackage
You can add ships to the board by drag & drop now!
Project file
del. .mpp
Merge remote-tracking branch 'origin/gamelogic-sprint1' into gui-sprint1
Merge branch 'Sprint1-Network' into merge-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
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/gui/BoardView.java
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/gui/MissileView.java
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/network/Connection.java
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/network/ConnectionHandler.java
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/network/NetworkInformation.java
...
Merge remote-tracking branch 'origin/Sprint1-Network' into gui-sprint1
I hope everything is still ok

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
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/gui/BoardView.java
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/gui/MissileView.java
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/network/Connection.java
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/network/ConnectionHandler.java
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/network/NetworkInformation.java
Merge remote-tracking branch 'origin/Sprint1-Network' into gui-sprint1
Removed ships from board, as they can now be added by drag & drop
Merge remote-tracking branch 'origin/merge-sprint1' into gui-sprint1

Conflicts:
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/Battleship.java
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/network/Connection.java
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/network/ConnectionHandler.java