Merge branch 'master' into annotations_paris

Conflicts:
	javers-core/src/main/java/org/javers/core/JaversCoreConfiguration.java