Test unitaire Schema commit
For merge
Merge branch 'master' of https://github.com/bzq/EnergyData

Conflicts:
	.classpath
	Schema.sql
	src/org/energydata/dao/ApplianceDaoImpl.java
	src/org/energydata/dao/HouseHoldDaoImpl.java
	test/org/energydata/dao/HouseHoldDaoImplTest.java