not much just made camera get jpg for
the moment
Merge branch 'dev/vision' of https://github.com/dkaynarc/tmc into dev/vision

Conflicts:
	src/cluster/Tmc/Vision/TrayDetectorVision.cs
Continued merge.
got form
Added ability to load camera images from a HTTP source.
sorter  constructer method return it's correct type
added colour detection, now working on putting fake tray detect just to get it working how it should when we actually get it working
removed comments from circle detect
working on doing the list that we return back to scada with cells and colours of tablets in the cells
Merge branch 'master' of https://github.com/dkaynarc/tmc into dev/vision
Merge branch 'dev/scada' of https://github.com/dkaynarc/tmc into dev/vision

Conflicts:
	src/cluster/Tmc/Vision/Camera.cs
ommiting all the files
errors gone
colour enum now is the global one, and list used for tray
Merge branch 'dev/vision' into dev/scada