removed override annotations

there was a build error in Eclipse. No idea what that's about
removed overrides
Merge remote-tracking branch 'origin/master' into classifier