refactoring of the java server
Merge branch 'master' of https://github.com/HSLUStefanBachmann/BDAStefanCurdin