Merge branch 'master' into v2_6_0

# Conflicts:
#	Dockerfile
#	README.md
#	pom.xml
#	src/main/java/de/deadlocker8/budgetmaster/controller/AboutController.java
#	src/main/resources/languages/news_de.properties
#	src/main/resources/languages/news_en.properties
#	src/main/resources/static/js/transactions.js