Added device id info on settings tab
Merge branch 'master' of github.com:lelylan/device-component-ng