Merge branch 'master' of https://github.com/hazelcast/hazelcast
Merge branch 'master' of https://github.com/hazelcast/hazelcast
Merge branch 'master' of https://github.com/hazelcast/hazelcast
fixed #2233 - scripting made optional, if not available a warning is given to the log
Removed unused imports
initial doc
client heart-beat implemented
ClientProperties added
compilation fix
doc updated
client proxy init synced
cleanup
find-bugs and check-style issues
map delayed store & eviction fre-write first commit
Merge branch 'master' of github.com:hazelcast/hazelcast into client-proxy-init/3.3

Conflicts:
	hazelcast-client/src/main/java/com/hazelcast/client/spi/ProxyManager.java
Merge branch 'master' of github.com:hazelcast/hazelcast into client-proxy-init/3.3

Conflicts:
	hazelcast-client/src/main/java/com/hazelcast/client/spi/ProxyManager.java
Merge branch 'master' of https://github.com/hazelcast/hazelcast

Conflicts:
	hazelcast/src/main/java/com/hazelcast/map/MapEvictionManager.java
Fixed #2411 - NPE when reading non existing value on replicatedmap with client
map store test fixes
changed the inner class to static
map delayed store & eviction re-write cleanup