initParse
Merge branch 'master' of
https://github.com/TakumaMochizuki/HappyHome.git

Conflicts:
	src/com/happy/home/dao/FacilityDAO.java
Merge branch 'master' of
https://github.com/TakumaMochizuki/HappyHome.git

Conflicts:
	project.properties
Merge branch 'master' of https://github.com/TakumaMochizuki/HappyHome

Conflicts:
	src/com/happy/home/dao/FacilityDAO.java
t