Move cleaning of junit to seperate file
Merge branch 'master' into vgl2