Updates for Cylon core changes (removal of Connection/Device)
Merge branch 'master' into videofeed-upd

Conflicts:
	lib/adaptor.js
	lib/camera.js
	spec/lib/adaptor.spec.js
	spec/lib/camera.spec.js