add hadoop depend
Merge remote-tracking branch 'origin/master'

Conflicts:
	MicroGridPower/pom.xml