final commit for today
Merge branch 'master' of https://github.com/T1m1/de.htwg.se.monopoly.git
change java version
Merge branch 'master' of https://github.com/T1m1/de.htwg.se.monopoly.git