fixed classpath fil så mockito er med
Merge branch 'master' into andreas
fixed , as decimal point in charlie groups weekly overview