Merge pull request #22 from i3mainz/master

merge from master to copyedit_engelt
Merge pull request #24 from i3mainz/copyedit_tkohr

Copyedit tkohr
Merge pull request #25 from i3mainz/master

pull_tkohr_120214
commit_1202#3
Merge pull request #26 from i3mainz/copyedit_engelt

Copyedit engelt
Merge pull request #27 from i3mainz/copyedit_tkohr

deleted Minen in Herrschaftsgebiet
Merge pull request #28 from i3mainz/master

merge from master to copyedit_engelt_13_02
Merge pull request #29 from i3mainz/copyedit_engelt

Merge pull request #28 from i3mainz/master
Merge pull request #30 from i3mainz/master

merge