Prepared classes for ComputerPlayer (moved and simplified code)
And now for something completely different: the user interface scales!
Probably fixed encoding problem
Merge remote-tracking branch 'origin/master' into gamelogic-sprint5
Merge remote-tracking branch 'origin/gui-sprint5' into gamelogic-sprint5
Improved PlayerState handling (moved to Game class, setActivePlayer())
- Moved the PlayerState handling to the Game class
- Improved "active player" handling
- Cleaned up "switch" statements
Improved zooming
Merge remote-tracking branch 'origin/gamelogic-sprint5' into gui-sprint5
Prevent multiple shots on slow or temporarily disabled network
Remove inactive opponents from list
Removed unused game rule settings
Merge branch 'master' of git@github.com:simonkrenger/ch.bfh.bti7301.w2013.battleship.git into network-sprint5

Conflicts:
	Battleship/src/main/java/ch/bfh/bti7301/w2013/battleship/network/DiscoverySocketListener.java
Merge branch 'master' of git@github.com:simonkrenger/ch.bfh.bti7301.w2013.battleship.git into network-sprint5