Merge pull request #21 from i3mainz/master

take edits from master
Merge pull request #23 from i3mainz/master

Commit_12_02_b_TE
added 3Kartierungen
Merge pull request #24 from i3mainz/copyedit_tkohr

Copyedit tkohr
Merge pull request #25 from i3mainz/master

pull_tkohr_120214