add device configuration
remove unless comments
Merge pull request #136 from jsilvestre/master

Market bug fixes
Merge pull request #138 from jsilvestre/master

Many changes
[FING] notifications more visible
Merge remote-tracking branch 'upstream/master'
add specific user API
Merge pull request #140 from aenario/master

[FING] notifications more visible
[AlarmManager] handles BOTH action & RRule
display devices only if it is necessary
merge conflict
Merge branch 'feature/encryption' of github.com:poupotte/cozy-home
move rrule as strict dependency
add comments
Merge remote-tracking branch 'zoe/master'
Merge pull request #144 from poupotte/master

Use user API and display devices
Merge pull request #142 from aenario/master

[AlarmManager] handles BOTH action & RRule
change user creation in test helper
bugfix
compiled