add .project
Remove @Override annotation

Remove @Override annotation to be compatible with JDK5
Merge remote-tracking branch 'origin/new-feature' into bug-fix