added equals/hashcode to implementing classes
Merge remote-tracking branch 'java/master'