Merge branch 'develop'
Migration from Maven to Gradle, including the Gradle wrapper
Merge remote-tracking branch 'remotes/origin/feature/gradle' into develop

Conflicts:
	client/pom.xml
	pom.xml
	ui/pom.xml