For pull
For Pull
Merge branch 'master' of https://github.com/bzq/EnergyData.git

Conflicts:
	.classpath
	bin/org/energydata/dao/ApplianceDaoImpl.class
	bin/org/energydata/dao/HouseHoldDaoImpl.class
	bin/org/energydata/dao/dao.properties
	bin/org/energydata/service/dataloader/DataLoader.class
	bin/org/energydata/service/dataloader/FileDataLoader.class
	test/org/energydata/dao/HouseHoldDaoImplTest.java
Completer HouseHoldDaoImpl