Merge branch 'Release2'

Oliver Rask Schmahlrequested to merge
release2.1 into master

Conflicts:

src/main/java/hotciv/standard/GameImpl.java

Merge request reports