some improvements
conflict fix
Merge branch '3.0' of github.com:hazelcast/hazelcast into 3.0
cleanup
connection improvements
merge
improvements
client, working finally. handled the reconnection
resolved conflict