Merge branch 'master' into v2_5_0

# Conflicts:
#	Dockerfile
#	pom.xml
#	src/main/java/de/deadlocker8/budgetmaster/templates/Template.java
#	src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
#	src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction.java
#	src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionBase.java
#	src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
#	src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java
#	src/main/java/de/deadlocker8/budgetmaster/utils/eventlistener/IntroduceIsExpenditureMember.java
#	src/main/resources/templates/templates/newTemplate.ftl
#	src/main/resources/templates/transactions/newTransactionMacros.ftl
#	src/main/resources/templates/transactions/newTransactionNormal.ftl
#	src/main/resources/templates/transactions/newTransactionRepeating.ftl
#	src/main/resources/templates/transactions/newTransactionTransfer.ftl