Removed a old java-file
Merge branch 'master' into javascript_interactive

Conflicts:
	src/main/java/g1/database/MainClass.java