Test observation ressource, nothing change
fix conflict
Merge branch 'master' of https://github.com/quangdung/AMT-Project1
Merge branch 'master' of https://github.com/quangdung/AMT-Project1
Merge branch 'master' of https://github.com/quangdung/AMT-Project1
update SensorDTO