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

Conflicts:
	.classpath
	WebContent/WEB-INF/classes/org/energydata/dao/dao.properties
	src/org/energydata/dao/dao.properties