add device configuration
remove unless comments
Merge remote-tracking branch 'upstream/master'
add specific user API
display devices only if it is necessary
merge conflict
Merge branch 'feature/encryption' of github.com:poupotte/cozy-home
Merge remote-tracking branch 'zoe/master'