Merge origin/master

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

Conflicts:
	backend/Danta/DantaRest/src/main/java/pixelated/danta/service/FamilyPaymentLogicController.java
Merge origin/juanc into sheng

Conflicts:
	backend/Danta/DantaRest/src/main/java/pixelated/danta/dao/FamilyDao.java
	backend/Danta/DantaRest/src/main/java/pixelated/danta/service/FamilyInformationService.java
Merge origin/juanc into sheng

Conflicts:
	backend/Danta/DantaRest/src/main/java/pixelated/danta/dao/FamilyDao.java
	backend/Danta/DantaRest/src/main/java/pixelated/danta/service/FamilyInformationService.java
Merge origin/sheng into juanc