Hazelcast Inc.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	hazelcast-documentation/src/main/docbook/manual/content/index.xml
Merge branch 'master' of https://github.com/hazelcast/hazelcast
Merge branch 'master' of https://github.com/hazelcast/hazelcast
Client cleanup; lots of javadoc