Updated UML diagram
Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7301.w2013.battleship
Merge remote-tracking branch 'origin/master' into gamelogic-sprint5