commit before merge.
Merge branch 'master' of https://github.com/silicontrip/DroboDashboard

Conflicts:
	dash.m
Moving the status enum to string into the ESATMUpdate class.