adddevice screen issues fixed
Merge pull request #273 from raghuvissu/master

adddevice screen issues fixed
..
Merge remote-tracking branch 'upstream/master'