Devices View Controller adapted to model
Merge remote-tracking branch 'origin/develop' into develop
Minor Model Fixes