Merge branch 'master' of https://github.com/eminn/hazelcast into eminn-master
Merge remote-tracking branch 'origin/master'
changes the equals and hashcode to uset getName instead of getId
adds equals and hashcode methods to the ClientProxy class which resembles its server-side counter part
Merge branch 'master' into add_clientproxy_equals_hashcode
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
 #1691 modifies equals and hashcode to consider the client name, which is unique for each HazelcastClient instance
Merge branch 'master' into add_clientproxy_equals_hashcode

Conflicts:
	hazelcast-client/src/main/java/com/hazelcast/client/proxy/ClientExecutorServiceProxy.java
	hazelcast-client/src/main/java/com/hazelcast/client/proxy/ClientReplicatedMapProxy.java
	hazelcast-client/src/main/java/com/hazelcast/client/spi/ProxyManager.java
sync with upstream
removes commented code
multimap remove entry listener fix
MemberAttributeOperationType introduced to remove the dependency to MapOperationType
find-bugs issue
another find-bugs issue
Merge branch 'master' of github.com:hazelcast/hazelcast
client configuration from xml fix
fix for xml config