Merged with sroethleRelease1
new version after first merge
Merge branch 'jburgmeier2' of https://github.com/WCTC-Distributed-Java/redproject.git into release1
Merge branch 'mock_release1' of https://github.com/WCTC-Distributed-Java/redproject.git into release1
Merged Group together - Release 1
merged with release 1