Merge branch 'master' into OZG-3929-spring-upgrade

# Conflicts:
#	goofy-client/pom.xml
#	goofy-server/pom.xml

goofy-server/pom.xml

@@ -201,11 +201,13 @@
 						</goals>
 						<configuration>
 							<outputDirectory>
-                ${project.build.directory}/classes/META-INF/resources</outputDirectory>
+								${project.build.directory}/classes/META-INF/resources
+							</outputDirectory>
 							<resources>
 								<resource>
 									<directory>
-                    ../${project.parent.artifactId}-client/dist/apps/goofy/</directory>
+										../${project.parent.artifactId}-client/dist/apps/goofy/
+									</directory>
 								</resource>
 							</resources>
 						</configuration>