Fix reference to deviceObj
Merge branch 'develop' of github.com:ninjablocks/client into develop