Not sure why this commit is needed
Merge branch '1.2_Scores' of https://github.com/mof66/HealthyHome into 1.2_Scores

Conflicts:
	.idea/workspace.xml