Wifi data transfer commit
Merge branch 'master' of https://github.com/robinbj86/EnergyWastingApp