Add @Override annotation where needed.

Starting with Java 6, we can annotate with @Override a class method implementing
a method from an interface.
Merge branch 'openwide-java-add-override-annotations-where-needed-dev' into dev.  However, some of the methods marked @Override are in fact not present in Java6 and so produce errors in the IDE and were therefore removed.