Merge branch 'master' into develop

Conflicts:
	build.xml
	client/pom.xml
	client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemoteThread.java
	commons/pom.xml
	core/pom.xml
	core/src/main/java/com/orientechnologies/orient/core/OConstants.java
	core/src/main/java/com/orientechnologies/orient/core/cache/OCache.java
	core/src/main/java/com/orientechnologies/orient/core/cache/OCacheLevelTwoLocatorRemote.java
	core/src/main/java/com/orientechnologies/orient/core/cache/ODefaultCache.java
	core/src/main/java/com/orientechnologies/orient/core/cache/OLevel2RecordCache.java
	core/src/main/java/com/orientechnologies/orient/core/cache/OLocalRecordCache.java
	core/src/main/java/com/orientechnologies/orient/core/db/record/ODatabaseRecordAbstract.java
	core/src/main/java/com/orientechnologies/orient/core/intent/OIntentMassiveInsert.java
	core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/OStorageLocal.java
	core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/OLocalPaginatedStorage.java
	core/src/test/java/com/orientechnologies/orient/core/cache/ODefaultCacheCleanUpTest.java
	core/src/test/java/com/orientechnologies/orient/core/cache/ODefaultCacheTest.java
	distributed/config/orientdb-dserver-config.xml
	distributed/pom.xml
	distributed/src/main/java/com/orientechnologies/orient/server/hazelcast/OHazelcastCache.java
	distributed/src/test/resources/orientdb-dserver-config-0.xml
	distributed/src/test/resources/orientdb-dserver-config-1.xml
	distributed/src/test/resources/orientdb-dserver-config-2.xml
	distributed/src/test/resources/sharded-dserver-config-0.xml
	distributed/src/test/resources/sharded-dserver-config-1.xml
	distributed/src/test/resources/sharded-dserver-config-2.xml
	distribution/pom.xml
	enterprise/pom.xml
	graphdb/pom.xml
	graphdb/src/main/java/com/tinkerpop/rexster/OrientGraphConfiguration.java
	graphdb/src/test/java/com/orientechnologies/orient/graph/blueprints/BlueprintsConcurrentAddEdgeTest.java
	nativeos/pom.xml
	object/pom.xml
	pom.xml
	server/pom.xml
	tests/pom.xml
	tests/src/test/java/com/orientechnologies/orient/test/database/auto/DocumentTrackingTest.java
	tests/src/test/java/com/orientechnologies/orient/test/database/auto/SchemaIndexTest.java
	tests/src/test/java/com/orientechnologies/orient/test/database/load/MemoryLeaksTest.java
	tools/pom.xml