Merge remote-tracking branch 'origin/master'

Conflicts:
	vertigo-labs-impl/src/main/java/JsonConverterHelper.java

	vertigo-labs-impl/src/test/java/io/vertigo/labs/trait/TraitManagerTest.java