temp
Merge branch 'master' of https://github.com/Hywela/EnergyZone_mApp

Conflicts:
	EnergyZone/src/main/res/raw/frag