no message
Improving look and feel
Tooltips!!!!!
no message
Merge branch 'master' of https://kevinlloyd.visualstudio.com/DefaultCollection/_git/Shas

Conflicts:
	src/shas/Views/Device/Index.cshtml
	src/shas/Views/Shared/_DeviceForm.cshtml
no message
Simplifying simulation for sprinklers and security