Test commit into 'gamelogic-sprint1'
Renamed 'Opponent' to 'NetworkPlayer'
Modified Player classes with the new methods
Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7301.w2013.battleship into gamelogic-sprint2
Merge remote-tracking branch 'origin/sprint2-network' into gamelogic-sprint2

Conflicts:
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/network/Connection.java
Fixed Singleton pattern (locally, may cause breakage further downstream)
Converted Game to Singleton, cleaned up Player classes
Merge remote-tracking branch 'origin/master' into gamelogic-sprint2

Conflicts:
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/network/Connection.java
Merge remote-tracking branch 'origin/sprint2-network' into gamelogic-sprint2

Conflicts:
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/network/Connection.java
Fixed Singleton pattern for Connection, removed try-catch blocks
Implemented large parts of the Board gamelogic, fixed Player methods
Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7301.w2013.battleship.git into gamelogic-sprint2
Fixed method names ('sendState' to 'setPlayerState')
Make code more readable, applied formatting and fixed imports
Cleaned up Player methods and interfaces
Merge remote-tracking branch 'origin/gamelogic-sprint2' into gui-sprint2
Fixed compile error after merge
Fixed some errors on initialization