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