Update nach Milestone 2, Thomas
Merge remote-tracking branch 'origin/master'