Es gibt den DJ! :)

Change-Id: I5cd369cdc49395c8e52a2b65491f893b4c882e64
Signed-off-by: Nicolas <studium@nmarin.de>
Merge branch 'master' of https://github.com/RWojtas/SEWS13.git
Fehler....

Change-Id: Iae9ec34713e9b608d2dd97a98d973b868458d366
Signed-off-by: Nicolas <studium@nmarin.de>