Update Diary and Brainstormin
Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7301.w2013.battleship.git
Merge branch 'master' of https://github.com/simonkrenger/ch.bfh.bti7301.w2013.battleship.git
Updated UML Models, Diary and Brainstorming
Merge branch 'master' into gamelogic-sprint1
Moved package "comm" to "network" to avoid merge conflicts