Merge branch 'DEVELOPMENT' of ssh://nwrk.biz:2294/~/server into DEVELOPMENT
authorRiMa <s1810567015@students.fh-hagenberg.at>
Tue, 18 Dec 2018 16:07:20 +0000 (17:07 +0100)
committerRiMa <s1810567015@students.fh-hagenberg.at>
Tue, 18 Dec 2018 16:07:20 +0000 (17:07 +0100)

Trivial merge