Bitte auf 1.6 Testen

Change-Id: I6eb97442daafe9b52dcd8e575660c266ed2c9e7b
Signed-off-by: Tobias <pahlings@gmail.com>
Merge branch 'master' of https://github.com/topahl/die-Strasse.git