Equipment control layout; Equipment state modifiers
Merge branch 'master' of https://github.com/picles/HouseControl

Conflicts:
	res/values/strings.xml