Change hashCode and equals to use guava style instead of java 7
Merge remote-tracking branch 'origin/master'