Merge origin/master

Conflicts:
	backend/Danta/DantaRest/src/main/java/pixelated/danta/service/FamilyPaymentLogicController.java