Raspberry Pi Version
Merge branch 'master' of https://github.com/AdrianRepRap/WiControl

Conflicts:
	run-heat-control
Resolved.