Merge remote-tracking branch 'origin/master'

# Conflicts:
#	target/classes/META-INF/build-info.properties
#	target/classes/git.properties
#	target/fdp-spring-boot.jar
#	target/fdp.jar
#	target/fdp.jar.original
#	target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst