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