Merge branch 'master' into develop

Conflicts:
	build.xml
	client/pom.xml
	commons/pom.xml
	core/pom.xml
	core/src/main/java/com/orientechnologies/orient/core/OConstants.java
	core/src/main/java/com/orientechnologies/orient/core/db/tool/ODatabaseExport.java
	core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/wal/OWriteAheadLog.java
	distributed/pom.xml
	distribution/pom.xml
	enterprise/pom.xml
	graphdb/pom.xml
	nativeos/pom.xml
	object/pom.xml
	pom.xml
	server/pom.xml
	tests/pom.xml
	tools/pom.xml