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

Conflicts:
	src/org/energydata/dao/MeasureDaoImpl.java
	src/org/energydata/services/DataLoaderFileImpl.java
Merge