Fix API/UI device addition. Support collectors.
Version 1.0.0beta1 -> 1.0.0beta2.
Merge branch 'release/1.0.0beta2' into develop