JAVA fertig
Merge branch 'master' of https://github.com/JaschaK/IR2014